luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 00:25:19 +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

8
src/remoteplayer.cpp
View File

@@ -98,7 +98,7 @@ void RemotePlayer::deSerialize(std::istream &is, const std::string &playername,
if (sao) {
try {
sao->setHPRaw(args.getS32("hp"));
sao->setHPRaw(args.getU16("hp"));
} catch(SettingNotFoundException &e) {
sao->setHPRaw(PLAYER_MAX_HP_DEFAULT);
}
@@ -115,7 +115,7 @@ void RemotePlayer::deSerialize(std::istream &is, const std::string &playername,
} catch (SettingNotFoundException &e) {}
try {
sao->setBreath(args.getS32("breath"), false);
sao->setBreath(args.getU16("breath"), false);
} catch (SettingNotFoundException &e) {}
try {
@@ -168,11 +168,11 @@ void RemotePlayer::serialize(std::ostream &os)
// This should not happen
assert(m_sao);
args.setS32("hp", m_sao->getHP());
args.setU16("hp", m_sao->getHP());
args.setV3F("position", m_sao->getBasePosition());
args.setFloat("pitch", m_sao->getLookPitch());
args.setFloat("yaw", m_sao->getRotation().Y);
args.setS32("breath", m_sao->getBreath());
args.setU16("breath", m_sao->getBreath());
std::string extended_attrs;
serializeExtraAttributes(extended_attrs);