From 2915bd5518150955ed1581110527f4bb4adadfe8 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 26 Jun 2011 01:31:43 +0300
Subject: more reorganizing of map code

---
 src/mapblock.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/mapblock.h')

diff --git a/src/mapblock.h b/src/mapblock.h
index 693bc5190..8f3b8464a 100644
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -38,6 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	#include "mapblock_mesh.h"
 #endif
 
+class Map;
 
 #define BLOCK_TIMESTAMP_UNDEFINED 0xffffffff
 
@@ -81,6 +82,7 @@ enum ModifiedState
 	BLOCKGEN_FULLY_GENERATED=6
 };*/
 
+#if 0
 enum
 {
 	NODECONTAINER_ID_MAPBLOCK,
@@ -108,23 +110,24 @@ public:
 		}
 	}
 };
+#endif
 
 /*
 	MapBlock itself
 */
 
-class MapBlock : public NodeContainer
+class MapBlock /*: public NodeContainer*/
 {
 public:
-	MapBlock(NodeContainer *parent, v3s16 pos, bool dummy=false);
+	MapBlock(Map *parent, v3s16 pos, bool dummy=false);
 	~MapBlock();
 	
-	virtual u16 nodeContainerId() const
+	/*virtual u16 nodeContainerId() const
 	{
 		return NODECONTAINER_ID_MAPBLOCK;
-	}
+	}*/
 	
-	NodeContainer * getParent()
+	Map * getParent()
 	{
 		return m_parent;
 	}
@@ -640,7 +643,7 @@ private:
 	*/
 
 	// NOTE: Lots of things rely on this being the Map
-	NodeContainer *m_parent;
+	Map *m_parent;
 	// Position in blocks on parent
 	v3s16 m_pos;
 	
-- 
cgit v1.2.3