added dedicated server build without irrlicht

[minetest.git] / src / mapblockobject.cpp

diff --git a/src/mapblockobject.cpp b/src/mapblockobject.cpp
index 3a28e2250eef5c602de77f51706262e8627be15a..8b52b9447f36599a916655e88d18b45d116662ba 100644 (file)
--- a/src/mapblockobject.cpp
+++ b/src/mapblockobject.cpp
@@ -145,7 +145,7 @@ void MovingObject::move(float dtime, v3f acceleration)
                for(s16 x = oldpos_i.X - 1; x <= oldpos_i.X + 1; x++)
                {
                        try{
-                               if(material_walkable(m_block->getNodeParent(v3s16(x,y,z)).d)
+                               if(content_walkable(m_block->getNodeParent(v3s16(x,y,z)).d)
                                                == false)
                                        continue;
                        }
@@ -339,17 +339,7 @@ void MapBlockObjectList::update(std::istream &is, u8 version,
                                        " id="<<id
                                        <<std::endl;*/
 
-                       if(type_id == MAPBLOCKOBJECT_TYPE_TEST)
-                       {
-                               // The constructors of objects shouldn't need
-                               // any more parameters than this.
-                               obj = new TestObject(m_block, id, pos);
-                       }
-                       else if(type_id == MAPBLOCKOBJECT_TYPE_TEST2)
-                       {
-                               obj = new Test2Object(m_block, id, pos);
-                       }
-                       else if(type_id == MAPBLOCKOBJECT_TYPE_SIGN)
+                       if(type_id == MAPBLOCKOBJECT_TYPE_SIGN)
                        {
                                obj = new SignObject(m_block, id, pos);
                        }