summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-06-08 03:48:33 +0200
committerarchshift <admin@archshift.com>2014-06-17 20:39:20 +0200
commit8eceaf9b0cadbc253e46cdcbf8a7b5e8d6070846 (patch)
treee63e20ed65f0a892a912b832e410a7563060c404
parentImplemented drinkable potions, noeffect entity effect, (diff)
downloadcuberite-8eceaf9b0cadbc253e46cdcbf8a7b5e8d6070846.tar
cuberite-8eceaf9b0cadbc253e46cdcbf8a7b5e8d6070846.tar.gz
cuberite-8eceaf9b0cadbc253e46cdcbf8a7b5e8d6070846.tar.bz2
cuberite-8eceaf9b0cadbc253e46cdcbf8a7b5e8d6070846.tar.lz
cuberite-8eceaf9b0cadbc253e46cdcbf8a7b5e8d6070846.tar.xz
cuberite-8eceaf9b0cadbc253e46cdcbf8a7b5e8d6070846.tar.zst
cuberite-8eceaf9b0cadbc253e46cdcbf8a7b5e8d6070846.zip
-rw-r--r--src/Entities/Entity.h2
-rw-r--r--src/Entities/Player.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 2df66e353..b8f1f4c1c 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -315,7 +315,7 @@ public:
virtual void Killed(cEntity * a_Victim) {}
/// Heals the specified amount of HPs
- void Heal(int a_HitPoints);
+ virtual void Heal(int a_HitPoints);
/// Returns the health of this entity
int GetHealth(void) const { return m_Health; }
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 83114a4dd..3aba3289d 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -261,7 +261,7 @@ public:
void TossPickup(const cItem & a_Item);
/** Heals the player by the specified amount of HPs (positive only); sends health update */
- void Heal(int a_Health);
+ virtual void Heal(int a_Health) override;
int GetFoodLevel (void) const { return m_FoodLevel; }
double GetFoodSaturationLevel (void) const { return m_FoodSaturationLevel; }