diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2018-03-29 13:41:48 +0200 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2018-03-29 13:54:44 +0200 |
| commit | 0396717256bb15ecb76469b7f148cfd6d952b34e (patch) | |
| tree | 8e9d51825fb18aa1abeb2668cc0cb32c9f58fdf5 /src | |
| parent | ef979ee2e9b3109e2b5348014e7ae4b3efdd666c (diff) | |
| download | minetest-0396717256bb15ecb76469b7f148cfd6d952b34e.tar.gz minetest-0396717256bb15ecb76469b7f148cfd6d952b34e.tar.bz2 minetest-0396717256bb15ecb76469b7f148cfd6d952b34e.zip | |
Fix a warning introduced by c5b4e541749c50805519ce040d98a0a8e5e0ec03
Diffstat (limited to 'src')
| -rw-r--r-- | src/content_sao.cpp | 8 | ||||
| -rw-r--r-- | src/content_sao.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp index f2cd0ff11..4959ec569 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -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; } diff --git a/src/content_sao.h b/src/content_sao.h index 10630014c..509f477dd 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -117,7 +117,7 @@ public: 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); |