From f43b65cf53274d1bbb43e2041ce72ff9eb68a7c8 Mon Sep 17 00:00:00 2001 From: faketruth Date: Fri, 9 Mar 2012 13:42:28 +0000 Subject: cClientHandles have a unique ID now to distinguish them cAuthenticator uses unique client ID for authentication Changed the kick function used by cAuthenticator to take a client ID instead of name, so the correct user is kicked Using callback reference instead of pointer in GetChunkData and affiliates GetChunkData returns false when failed, and true when succeeded Renamed entity type enums to something prettier Exposed some functions to Lua git-svn-id: http://mc-server.googlecode.com/svn/trunk@388 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cEntity.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/cEntity.h') 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 -- cgit v1.2.3