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
2012-03-24 11:14:34 +00:00
parent be31652c40
commit b69ac328c0
18 changed files with 47 additions and 258 deletions
@@ -41,17 +41,7 @@ protected:
 		, m_BlockType( a_BlockType ) 
 		, m_World( a_World )
 	{}
-	
-	cBlockEntity(ENUM_BLOCK_ID a_BlockType, int a_X, int a_Y, int a_Z)
-		: m_PosX( a_X )
-		, m_PosY( a_Y )
-		, m_PosZ( a_Z )
-		, m_BlockType( a_BlockType ) 
-		, m_World(NULL)
-	{}
-	
 public:
-
 	virtual ~cBlockEntity() {};
 	virtual void Destroy() {};
 	
@@ -62,7 +52,6 @@ public:
 	ENUM_BLOCK_ID GetBlockType() { return m_BlockType; }
 	
 	cWorld * GetWorld(void) const {return m_World; }
-	void     SetWorld(cWorld * a_World) {m_World = a_World; }

 	virtual void SaveToJson  (Json::Value & a_Value ) = 0;