diff options
| author | Safwat Halaby <SafwatHalaby@users.noreply.github.com> | 2015-12-22 06:43:50 +0100 |
|---|---|---|
| committer | Safwat Halaby <SafwatHalaby@users.noreply.github.com> | 2015-12-24 05:20:16 +0100 |
| commit | dfeced18b2397234340b94fe0ba61cc567c9cfc5 (patch) | |
| tree | bc50fe2d4f011c05eedd389ab4924747d0085baf /src/Mobs/Monster.h | |
| parent | Merge pull request #2811 from cuberite/isblockfence (diff) | |
| download | cuberite-dfeced18b2397234340b94fe0ba61cc567c9cfc5.tar cuberite-dfeced18b2397234340b94fe0ba61cc567c9cfc5.tar.gz cuberite-dfeced18b2397234340b94fe0ba61cc567c9cfc5.tar.bz2 cuberite-dfeced18b2397234340b94fe0ba61cc567c9cfc5.tar.lz cuberite-dfeced18b2397234340b94fe0ba61cc567c9cfc5.tar.xz cuberite-dfeced18b2397234340b94fe0ba61cc567c9cfc5.tar.zst cuberite-dfeced18b2397234340b94fe0ba61cc567c9cfc5.zip | |
Diffstat (limited to 'src/Mobs/Monster.h')
| -rw-r--r-- | src/Mobs/Monster.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h index 98b67f343..cc830a058 100644 --- a/src/Mobs/Monster.h +++ b/src/Mobs/Monster.h @@ -79,9 +79,9 @@ public: virtual void EventLosePlayer(void); virtual void CheckEventLostPlayer(void); - virtual void InStateIdle (std::chrono::milliseconds a_Dt); - virtual void InStateChasing (std::chrono::milliseconds a_Dt); - virtual void InStateEscaping(std::chrono::milliseconds a_Dt); + virtual void InStateIdle (std::chrono::milliseconds a_Dt, cChunk & a_Chunk); + virtual void InStateChasing (std::chrono::milliseconds a_Dt, cChunk & a_Chunk); + virtual void InStateEscaping(std::chrono::milliseconds a_Dt, cChunk & a_Chunk); int GetAttackRate() { return static_cast<int>(m_AttackRate); } void SetAttackRate(float a_AttackRate) { m_AttackRate = a_AttackRate; } @@ -193,7 +193,7 @@ protected: /** Returns if a monster can reach a given height by jumping. */ inline bool DoesPosYRequireJump(int a_PosY) { - return ((a_PosY > POSY_TOINT) && (a_PosY == POSY_TOINT + 1)); + return ((a_PosY > POSY_TOINT)); } /** Move in a straight line to the next waypoint in the path, will jump if needed. */ |