From ffb17f1c9a203fea6de70159b461f52d104e05b9 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Mon, 11 Feb 2019 00:03:26 +0100 Subject: 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. --- src/database/database-files.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/database/database-files.cpp') diff --git a/src/database/database-files.cpp b/src/database/database-files.cpp index 04ff5230a..d09f1c074 100644 --- a/src/database/database-files.cpp +++ b/src/database/database-files.cpp @@ -44,11 +44,11 @@ void PlayerDatabaseFiles::serialize(std::ostringstream &os, RemotePlayer *player args.set("name", player->getName()); sanity_check(player->getPlayerSAO()); - args.setS32("hp", player->getPlayerSAO()->getHP()); + args.setU16("hp", player->getPlayerSAO()->getHP()); args.setV3F("position", player->getPlayerSAO()->getBasePosition()); args.setFloat("pitch", player->getPlayerSAO()->getLookPitch()); args.setFloat("yaw", player->getPlayerSAO()->getRotation().Y); - args.setS32("breath", player->getPlayerSAO()->getBreath()); + args.setU16("breath", player->getPlayerSAO()->getBreath()); std::string extended_attrs; player->serializeExtraAttributes(extended_attrs); -- cgit v1.2.3