From b69ac328c06ca77fb4c692f15b0ecc5d4246ec72 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 24 Mar 2012 11:14:34 +0000 Subject: Reverted the previous commit - it is useless, since entities still depend heavily on cWorld git-svn-id: http://mc-server.googlecode.com/svn/trunk@428 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cEntity.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'source/cEntity.h') diff --git a/source/cEntity.h b/source/cEntity.h index 179af4b17..1b26f46be 100644 --- a/source/cEntity.h +++ b/source/cEntity.h @@ -84,9 +84,6 @@ public: //tolua_export int GetChunkY(void) const {return m_ChunkY; } int GetChunkZ(void) const {return m_ChunkZ; } - // Can be used only once - to set the initial world after loading. Not to be used for moving to another world! - void SetWorld( cWorld* a_World ) { ASSERT(m_World == NULL); m_World = a_World; } - void SetPosX( const double & a_PosX ); //tolua_export void SetPosY( const double & a_PosY ); //tolua_export void SetPosZ( const double & a_PosZ ); //tolua_export @@ -113,6 +110,7 @@ public: //tolua_export protected: virtual void Destroyed() {} // Called after the entity has been destroyed + void SetWorld( cWorld* a_World ) { m_World = a_World; } void MoveToCorrectChunk(bool a_bIgnoreOldChunk = false); friend class cReferenceManager; -- cgit v1.2.3