summaryrefslogtreecommitdiffstats
path: root/source/Entities
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-10-13 13:47:55 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-10-13 13:47:55 +0200
commitd8d2f35e9dd354fba14f8d6512e818d18d2066c2 (patch)
tree159374402a90eb8a6b15e5a4bef2ea2d854985fa /source/Entities
parentSeventh round of fixes (diff)
downloadcuberite-d8d2f35e9dd354fba14f8d6512e818d18d2066c2.tar
cuberite-d8d2f35e9dd354fba14f8d6512e818d18d2066c2.tar.gz
cuberite-d8d2f35e9dd354fba14f8d6512e818d18d2066c2.tar.bz2
cuberite-d8d2f35e9dd354fba14f8d6512e818d18d2066c2.tar.lz
cuberite-d8d2f35e9dd354fba14f8d6512e818d18d2066c2.tar.xz
cuberite-d8d2f35e9dd354fba14f8d6512e818d18d2066c2.tar.zst
cuberite-d8d2f35e9dd354fba14f8d6512e818d18d2066c2.zip
Diffstat (limited to 'source/Entities')
-rw-r--r--source/Entities/Entity.h21
1 files changed, 8 insertions, 13 deletions
diff --git a/source/Entities/Entity.h b/source/Entities/Entity.h
index 07bc84937..064275c06 100644
--- a/source/Entities/Entity.h
+++ b/source/Entities/Entity.h
@@ -102,13 +102,6 @@ public:
etBoat,
etTNT,
etProjectile,
-
- // DEPRECATED older constants, left over for compatibility reasons (plugins)
- etMob = etMonster, // DEPRECATED, use etMonster instead!
- eEntityType_Entity = etEntity,
- eEntityType_Player = etPlayer,
- eEntityType_Pickup = etPickup,
- eEntityType_Mob = etMob,
} ;
// tolua_end
@@ -123,12 +116,14 @@ 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 == etMob); }
- 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 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); }
/// 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;