diff options
Diffstat (limited to 'src/Mobs')
| -rw-r--r-- | src/Mobs/Enderman.cpp | 20 | ||||
| -rw-r--r-- | src/Mobs/Enderman.h | 1 | ||||
| -rw-r--r-- | src/Mobs/Monster.h | 2 |
3 files changed, 22 insertions, 1 deletions
diff --git a/src/Mobs/Enderman.cpp b/src/Mobs/Enderman.cpp index 51255beb3..567714382 100644 --- a/src/Mobs/Enderman.cpp +++ b/src/Mobs/Enderman.cpp @@ -181,3 +181,23 @@ bool cEnderman::CheckLight() return true; } + + + + + +void cEnderman::Tick(float a_Dt, cChunk & a_Chunk) +{ + super::Tick(a_Dt, a_Chunk); + + // TODO take damage in rain + + // Take damage when touching water, drowning damage seems to be most appropriate + if (IsSwimming()) + { + EventLosePlayer(); + TakeDamage(dtDrowning, NULL, 1, 0); + // TODO teleport to a safe location + } + +} diff --git a/src/Mobs/Enderman.h b/src/Mobs/Enderman.h index 4583746e7..947c32b96 100644 --- a/src/Mobs/Enderman.h +++ b/src/Mobs/Enderman.h @@ -21,6 +21,7 @@ public: virtual void CheckEventSeePlayer(void) override; virtual void CheckEventLostPlayer(void) override; virtual void EventLosePlayer(void) override; + virtual void Tick(float a_Dt, cChunk & a_Chunk) override; bool IsScreaming(void) const {return m_bIsScreaming; } BLOCKTYPE GetCarriedBlock(void) const {return CarriedBlock; } diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h index ba746ebc8..a1f9c4a5b 100644 --- a/src/Mobs/Monster.h +++ b/src/Mobs/Monster.h @@ -25,7 +25,7 @@ class cMonster : typedef cPawn super; public: - //Depreciated + // Deprecated typedef eMonsterType eType; enum eFamily |