diff options
| author | SmallJoker <SmallJoker@users.noreply.github.com> | 2019-02-11 00:03:26 +0100 |
|---|---|---|
| committer | Paramat <paramat@users.noreply.github.com> | 2019-02-10 23:03:26 +0000 |
| commit | ffb17f1c9a203fea6de70159b461f52d104e05b9 (patch) | |
| tree | ca2c9f26515b8c6dad2a42b7e09f5d2a91d6f398 /src/genericobject.cpp | |
| parent | ba5a9f2b361a2fa01d1a3396999a5833983c0f4a (diff) | |
| download | minetest-ffb17f1c9a203fea6de70159b461f52d104e05b9.tar.gz minetest-ffb17f1c9a203fea6de70159b461f52d104e05b9.tar.bz2 minetest-ffb17f1c9a203fea6de70159b461f52d104e05b9.zip | |
Consistent HP and damage types (#8167)
Remove deprecated HUDs and chat message handling.
Remove unused m_damage variable (compat break).
HP: s32 for setter/calculations, u16 for getter.
Diffstat (limited to 'src/genericobject.cpp')
| -rw-r--r-- | src/genericobject.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/genericobject.cpp b/src/genericobject.cpp index b1ec8ce4e..49d16001f 100644 --- a/src/genericobject.cpp +++ b/src/genericobject.cpp @@ -92,15 +92,13 @@ std::string gob_cmd_set_sprite( return os.str(); } -std::string gob_cmd_punched(s16 damage, s16 result_hp) +std::string gob_cmd_punched(u16 result_hp) { std::ostringstream os(std::ios::binary); // command writeU8(os, GENERIC_CMD_PUNCHED); - // damage - writeS16(os, damage); // result_hp - writeS16(os, result_hp); + writeU16(os, result_hp); return os.str(); } |