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/mapblockobject.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'src/mapblockobject.cpp')

diff --git a/src/mapblockobject.cpp b/src/mapblockobject.cpp
index 009163a18..51ac4c66b 100644
--- a/src/mapblockobject.cpp
+++ b/src/mapblockobject.cpp
@@ -856,16 +856,7 @@ bool MapBlockObjectList::wrapObject(MapBlockObject *object)
 	assert(m_objects.find(object->m_id) != NULL);
 	assert(m_objects[object->m_id] == object);
 
-	NodeContainer *parentcontainer = m_block->getParent();
-	// This will only work if the parent is the map
-	if(parentcontainer->nodeContainerId() != NODECONTAINER_ID_MAP)
-	{
-		dstream<<"WARNING: Wrapping object not possible: "
-				"MapBlock's parent is not map"<<std::endl;
-		return true;
-	}
-	// OK, we have the map!
-	Map *map = (Map*)parentcontainer;
+	Map *map = m_block->getParent();
 	
 	// Calculate blockpos on map
 	v3s16 oldblock_pos_i_on_map = m_block->getPosRelative();
-- 
cgit v1.2.3


From bb940a946dbca49dc03af83fe55d195bd9fdc62e Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 26 Jun 2011 02:34:36 +0300
Subject: even more code refactoring

---
 src/mapblockobject.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mapblockobject.cpp')

diff --git a/src/mapblockobject.cpp b/src/mapblockobject.cpp
index 51ac4c66b..ab1c20267 100644
--- a/src/mapblockobject.cpp
+++ b/src/mapblockobject.cpp
@@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "map.h"
 #include "inventory.h"
 #include "utility.h"
+#include "mapblock.h"
 
 /*
 	MapBlockObject
-- 
cgit v1.2.3