diff options
| author | Mattes D <github@xoft.cz> | 2014-03-25 21:02:23 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-03-25 21:02:23 +0100 |
| commit | cac5149974b9cd76abbedc9d08a75b0e4f7b7e03 (patch) | |
| tree | 38b2f9d52cb2dc106d4211f61da5953646a4bdeb /src/Entities/Entity.h | |
| parent | Merge pull request #828 from mc-server/Wither (diff) | |
| parent | Ender crystals (diff) | |
| download | cuberite-cac5149974b9cd76abbedc9d08a75b0e4f7b7e03.tar cuberite-cac5149974b9cd76abbedc9d08a75b0e4f7b7e03.tar.gz cuberite-cac5149974b9cd76abbedc9d08a75b0e4f7b7e03.tar.bz2 cuberite-cac5149974b9cd76abbedc9d08a75b0e4f7b7e03.tar.lz cuberite-cac5149974b9cd76abbedc9d08a75b0e4f7b7e03.tar.xz cuberite-cac5149974b9cd76abbedc9d08a75b0e4f7b7e03.tar.zst cuberite-cac5149974b9cd76abbedc9d08a75b0e4f7b7e03.zip | |
Diffstat (limited to 'src/Entities/Entity.h')
| -rw-r--r-- | src/Entities/Entity.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index df80093e5..e41f74b09 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -69,6 +69,7 @@ public: enum eEntityType { etEntity, // For all other types + etEnderCrystal, etPlayer, etPickup, etMonster, @@ -130,18 +131,19 @@ public: eEntityType GetEntityType(void) const { return m_EntityType; } - bool IsPlayer (void) const { return (m_EntityType == etPlayer); } - bool IsPickup (void) const { return (m_EntityType == etPickup); } - bool IsMob (void) const { return (m_EntityType == etMonster); } + bool IsEnderCrystal(void) const { return (m_EntityType == etEnderCrystal); } + bool IsPlayer (void) const { return (m_EntityType == etPlayer); } + bool IsPickup (void) const { return (m_EntityType == etPickup); } + bool IsMob (void) const { return (m_EntityType == etMonster); } bool IsFallingBlock(void) const { return (m_EntityType == etFallingBlock); } - bool IsMinecart (void) const { return (m_EntityType == etMinecart); } - bool IsBoat (void) const { return (m_EntityType == etBoat); } - bool IsTNT (void) const { return (m_EntityType == etTNT); } - bool IsProjectile (void) const { return (m_EntityType == etProjectile); } - bool IsExpOrb (void) const { return (m_EntityType == etExpOrb); } - bool IsFloater (void) const { return (m_EntityType == etFloater); } - bool IsItemFrame (void) const { return (m_EntityType == etItemFrame); } - bool IsPainting (void) const { return (m_EntityType == etPainting); } + bool IsMinecart (void) const { return (m_EntityType == etMinecart); } + bool IsBoat (void) const { return (m_EntityType == etBoat); } + bool IsTNT (void) const { return (m_EntityType == etTNT); } + bool IsProjectile (void) const { return (m_EntityType == etProjectile); } + bool IsExpOrb (void) const { return (m_EntityType == etExpOrb); } + bool IsFloater (void) const { return (m_EntityType == etFloater); } + bool IsItemFrame (void) const { return (m_EntityType == etItemFrame); } + bool IsPainting (void) const { return (m_EntityType == etPainting); } /// Returns true if the entity is of the specified class or a subclass (cPawn's IsA("cEntity") returns true) virtual bool IsA(const char * a_ClassName) const; |