Skip to content
Permalink
Browse files

Fix a warning introduced by c5b4e54

  • Loading branch information
nerzhul committed Mar 29, 2018
1 parent ef979ee commit 0396717256bb15ecb76469b7f148cfd6d952b34e
Showing with 6 additions and 4 deletions.
  1. +5 −3 src/content_sao.cpp
  2. +1 −1 src/content_sao.h
@@ -566,7 +566,8 @@ int LuaEntitySAO::punch(v3f dir,

if (!damage_handled) {
if (result.did_punch) {
setHP(getHP() - result.damage);
setHP(getHP() - result.damage,
PlayerHPChangeReason(PlayerHPChangeReason::SET_HP));

if (result.damage > 0) {
std::string punchername = puncher ? puncher->getDescription() : "nil";
@@ -634,9 +635,10 @@ std::string LuaEntitySAO::getDescription()
return os.str();
}

void LuaEntitySAO::setHP(s16 hp)
void LuaEntitySAO::setHP(s16 hp, const PlayerHPChangeReason &reason)
{
if(hp < 0) hp = 0;
if (hp < 0)
hp = 0;
m_hp = hp;
}

@@ -117,7 +117,7 @@ class LuaEntitySAO : public UnitSAO
void moveTo(v3f pos, bool continuous);
float getMinimumSavedMovement();
std::string getDescription();
void setHP(s16 hp);
void setHP(s16 hp, const PlayerHPChangeReason &reason);
s16 getHP() const;
/* LuaEntitySAO-specific */
void setVelocity(v3f velocity);

0 comments on commit 0396717

Please sign in to comment.