summaryrefslogtreecommitdiff
path: root/src/client/client.h
diff options
context:
space:
mode:
authorSmallJoker <SmallJoker@users.noreply.github.com>2019-02-11 00:03:26 +0100
committerParamat <paramat@users.noreply.github.com>2019-02-10 23:03:26 +0000
commitffb17f1c9a203fea6de70159b461f52d104e05b9 (patch)
treeca2c9f26515b8c6dad2a42b7e09f5d2a91d6f398 /src/client/client.h
parentba5a9f2b361a2fa01d1a3396999a5833983c0f4a (diff)
downloadminetest-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/client/client.h')
-rw-r--r--src/client/client.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/client.h b/src/client/client.h
index ef700e477..60735f665 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -243,7 +243,7 @@ public:
void clearOutChatQueue();
void sendChangePassword(const std::string &oldpassword,
const std::string &newpassword);
- void sendDamage(u8 damage);
+ void sendDamage(u16 damage);
void sendRespawn();
void sendReady();
@@ -342,7 +342,7 @@ public:
bool mediaReceived()
{ return !m_media_downloader; }
- u8 getProtoVersion()
+ u16 getProtoVersion()
{ return m_proto_ver; }
bool connectedToServer();
@@ -504,7 +504,7 @@ private:
// and aren't accurate. We simply just don't know, because
// the server didn't send the version back then.
// If 0, server init hasn't been received yet.
- u8 m_proto_ver = 0;
+ u16 m_proto_ver = 0;
u16 m_playeritem = 0;
bool m_inventory_updated = false;