diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-06-26 01:31:43 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-06-26 01:31:43 +0300 |
| commit | 2915bd5518150955ed1581110527f4bb4adadfe8 (patch) | |
| tree | 142947902c6ec80bbe36d949e4af6e7496c27906 /src/mapblockobject.cpp | |
| parent | cb130d9158dc4e9c456d088d5e214b7d829ccc3a (diff) | |
| download | minetest-2915bd5518150955ed1581110527f4bb4adadfe8.tar.gz minetest-2915bd5518150955ed1581110527f4bb4adadfe8.tar.bz2 minetest-2915bd5518150955ed1581110527f4bb4adadfe8.zip | |
more reorganizing of map code
Diffstat (limited to 'src/mapblockobject.cpp')
| -rw-r--r-- | src/mapblockobject.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
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(); |