diff options
author | Fabian <fenstein12@googlemail.com> | 2017-11-22 14:47:52 +0100 |
---|---|---|
committer | Alexander Harkness <me@bearbin.net> | 2017-11-22 14:47:52 +0100 |
commit | 0dd172b80ffc949cf87119ad2003589d7eb82c46 (patch) | |
tree | a7af747aa95241297f07104c138cfc66cf7f6c97 /src/Entities/Entity.h | |
parent | cBlockRail: Fix assertion failure (#4075) (diff) | |
download | cuberite-0dd172b80ffc949cf87119ad2003589d7eb82c46.tar cuberite-0dd172b80ffc949cf87119ad2003589d7eb82c46.tar.gz cuberite-0dd172b80ffc949cf87119ad2003589d7eb82c46.tar.bz2 cuberite-0dd172b80ffc949cf87119ad2003589d7eb82c46.tar.lz cuberite-0dd172b80ffc949cf87119ad2003589d7eb82c46.tar.xz cuberite-0dd172b80ffc949cf87119ad2003589d7eb82c46.tar.zst cuberite-0dd172b80ffc949cf87119ad2003589d7eb82c46.zip |
Diffstat (limited to 'src/Entities/Entity.h')
-rw-r--r-- | src/Entities/Entity.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index 4174160bf..fae296ab4 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -368,10 +368,10 @@ public: virtual void Heal(int a_HitPoints); /** Returns the health of this entity */ - int GetHealth(void) const { return m_Health; } + float GetHealth(void) const { return m_Health; } /** Sets the health of this entity; doesn't broadcast any hurt animation */ - void SetHealth(int a_Health); + void SetHealth(float a_Health); // tolua_end @@ -403,9 +403,9 @@ public: // tolua_begin /** Sets the maximum value for the health */ - void SetMaxHealth(int a_MaxHealth); + void SetMaxHealth(float a_MaxHealth); - int GetMaxHealth(void) const { return m_MaxHealth; } + float GetMaxHealth(void) const { return m_MaxHealth; } /** Sets whether the entity is fireproof */ void SetIsFireproof(bool a_IsFireproof); @@ -556,8 +556,8 @@ protected: Note that the UniqueID is not persisted through storage. */ UInt32 m_UniqueID; - int m_Health; - int m_MaxHealth; + float m_Health; + float m_MaxHealth; /** The entity to which this entity is attached (vehicle), nullptr if none */ cEntity * m_AttachedTo; |