diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-10-08 23:21:55 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-10-08 23:21:55 +0200 |
| commit | 7401fc000dca2a3ff3ce61776f84e5c2d8eb1868 (patch) | |
| tree | 4ba096c6fa039b527139b06b97615906a023e048 /source/Mobs | |
| parent | Initial Metadata Commit [SEE DESC] (diff) | |
| download | cuberite-7401fc000dca2a3ff3ce61776f84e5c2d8eb1868.tar cuberite-7401fc000dca2a3ff3ce61776f84e5c2d8eb1868.tar.gz cuberite-7401fc000dca2a3ff3ce61776f84e5c2d8eb1868.tar.bz2 cuberite-7401fc000dca2a3ff3ce61776f84e5c2d8eb1868.tar.lz cuberite-7401fc000dca2a3ff3ce61776f84e5c2d8eb1868.tar.xz cuberite-7401fc000dca2a3ff3ce61776f84e5c2d8eb1868.tar.zst cuberite-7401fc000dca2a3ff3ce61776f84e5c2d8eb1868.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/Mobs/Horse.cpp | 2 | ||||
| -rw-r--r-- | source/Mobs/Horse.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/Mobs/Horse.cpp b/source/Mobs/Horse.cpp index 50eab33cc..ec6154d26 100644 --- a/source/Mobs/Horse.cpp +++ b/source/Mobs/Horse.cpp @@ -11,7 +11,7 @@ cHorse::cHorse(int Type, int Color, int Style, int TameTimes) : super("Horse", 100, "mob.horse.hit", "mob.horse.death", 1.4, 1.6), - m_bIsChested(false), + m_bHasChest(false), m_bIsEating(false), m_bIsRearing(false), m_bIsMouthOpen(false), diff --git a/source/Mobs/Horse.h b/source/Mobs/Horse.h index d950ff1bf..bca2e5327 100644 --- a/source/Mobs/Horse.h +++ b/source/Mobs/Horse.h @@ -1,7 +1,7 @@ #pragma once -#include "AggressiveMonster.h" +#include "PassiveMonster.h" @@ -20,7 +20,7 @@ public: virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override; virtual void Tick(float a_Dt, cChunk & a_Chunk) override; virtual void OnRightClicked(cPlayer & a_Player) override; - bool IsChested (void) const {return m_bIsChested; } + bool IsChested (void) const {return m_bHasChest; } bool IsEating (void) const {return m_bIsEating; } bool IsRearing (void) const {return m_bIsRearing; } bool IsMthOpen (void) const {return m_bIsMouthOpen; } @@ -32,7 +32,7 @@ public: private: - bool m_bIsChested, m_bIsEating, m_bIsRearing, m_bIsMouthOpen, m_bIsTame; + bool m_bHasChest, m_bIsEating, m_bIsRearing, m_bIsMouthOpen, m_bIsTame; int m_Type, m_Color, m_Style, m_Armour, m_TimesToTame, m_TameAttemptTimes; } ; |