Merge pull request #960 from openmultiplayer/tommy/default-armor-hp-v…

…alues default values for hp and armor in Player::reset and constructor
openmultiplayer · Aug 10, 2024 · cffcc4b · cffcc4b
2 parents a9cf7d0 + 8557bde
commit cffcc4b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Server/Source/player_impl.hpp b/Server/Source/player_impl.hpp
@@ -158,6 +158,8 @@ struct Player final : public IPlayer, public PoolIDProvider, public NoCopy
  fightingStyle_ = PlayerFightingStyle_Normal;
  controllable_ = true;
  clockToggled_ = false;
+ health_ = 100.0f;
+ armour_ = 0.0f;
  keys_ = { 0u, 0, 0 };
  velocity_ = Vector3(0.0f, 0.0f, 0.0f);
  surfing_ = { PlayerSurfingData::Type::None };
@@ -219,6 +221,8 @@ struct Player final : public IPlayer, public PoolIDProvider, public NoCopy
  , state_(PlayerState_None)
  , controllable_(true)
  , clockToggled_(false)
+ , health_(100.0f)
+ , armour_(0.0f)
  , keys_ { 0u, 0, 0 }
  , velocity_(0.0f, 0.0f, 0.0f)
  , surfing_ { PlayerSurfingData::Type::None }