diff options
| author | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-09 14:42:28 +0100 |
|---|---|---|
| committer | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-09 14:42:28 +0100 |
| commit | f43b65cf53274d1bbb43e2041ce72ff9eb68a7c8 (patch) | |
| tree | 6799433ae65c4d4331bbfd6bcabe5bac38f6376c /source/cEntity.h | |
| parent | Using the _DEBUG macro for *nix debug builds as well; trying to force 8-byte alignment on critical sections ( http://forum.mc-server.org/showthread.php?tid=384 ) (diff) | |
| download | cuberite-f43b65cf53274d1bbb43e2041ce72ff9eb68a7c8.tar cuberite-f43b65cf53274d1bbb43e2041ce72ff9eb68a7c8.tar.gz cuberite-f43b65cf53274d1bbb43e2041ce72ff9eb68a7c8.tar.bz2 cuberite-f43b65cf53274d1bbb43e2041ce72ff9eb68a7c8.tar.lz cuberite-f43b65cf53274d1bbb43e2041ce72ff9eb68a7c8.tar.xz cuberite-f43b65cf53274d1bbb43e2041ce72ff9eb68a7c8.tar.zst cuberite-f43b65cf53274d1bbb43e2041ce72ff9eb68a7c8.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/cEntity.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/cEntity.h b/source/cEntity.h index 58c0b69f4..1b26f46be 100644 --- a/source/cEntity.h +++ b/source/cEntity.h @@ -57,11 +57,11 @@ public: //tolua_export virtual void Initialize( cWorld* a_World ); //tolua_export
- enum ENUM_ENTITY_TYPE //tolua_export
+ enum eEntityType //tolua_export
{ //tolua_export
- E_ENTITY, //tolua_export
- E_PLAYER, //tolua_export
- E_PICKUP //tolua_export
+ eEntityType_Entity, //tolua_export
+ eEntityType_Player, //tolua_export
+ eEntityType_Pickup //tolua_export
}; //tolua_export
virtual unsigned int GetEntityType() { return m_EntityType; } //tolua_export
@@ -136,7 +136,7 @@ protected: bool m_bDestroyed;
bool m_bRemovedFromChunk;
- ENUM_ENTITY_TYPE m_EntityType;
+ eEntityType m_EntityType;
cWorld* m_World;
}; //tolua_export
|