luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-18 18:55:29 +02:00
Code Activity

Consistent HP and damage types (#8167)

Browse Source 
Remove deprecated HUDs and chat message handling.
Remove unused m_damage variable (compat break).
HP: s32 for setter/calculations, u16 for getter.
This commit is contained in:
SmallJoker
2019-02-11 00:03:26 +01:00
committed by Paramat
parent ba5a9f2b36
commit ffb17f1c9a
25 changed files with 67 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/client/content_cao.cpp
View File

@@ -371,7 +371,7 @@ void GenericCAO::processInitData(const std::string &data)
m_id = readU16(is);
m_position = readV3F32(is);
m_rotation = readV3F32(is);
m_hp = readS16(is);
m_hp = readU16(is);
const u8 num_messages = readU8(is);
for (int i = 0; i < num_messages; i++) {
@@ -1508,11 +1508,10 @@ void GenericCAO::processMessage(const std::string &data)
updateAttachments();
} else if (cmd == GENERIC_CMD_PUNCHED) {
/*s16 damage =*/ readS16(is);
s16 result_hp = readS16(is);
u16 result_hp = readU16(is);
// Use this instead of the send damage to not interfere with prediction
s16 damage = m_hp - result_hp;
s32 damage = (s32)m_hp - (s32)result_hp;
m_hp = result_hp;