Mapgens: Rename m_emerge to prevent name collisions

[oweals/minetest.git] / src / collision.cpp

diff --git a/src/collision.cpp b/src/collision.cpp
index 76696e90db7deb8db0fd431f1a17b35d19c39743..9e0c85531cf4ced2cf987e17f4bcb9eca17e8d0a 100644 (file)
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -251,15 +251,19 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
        for(s16 z = min_z; z <= max_z; z++)
        {
                v3s16 p(x,y,z);
-               try{
+
+               bool is_position_valid;
+               MapNode n = map->getNodeNoEx(p, &is_position_valid);
+
+               if (is_position_valid) {
                        // Object collides into walkable nodes
-                       MapNode n = map->getNode(p);
+
                        const ContentFeatures &f = gamedef->getNodeDefManager()->get(n);
                        if(f.walkable == false)
                                continue;
                        int n_bouncy_value = itemgroup_get(f.groups, "bouncy");
 
-                       std::vector<aabb3f> nodeboxes = n.getNodeBoxes(gamedef->ndef());
+                       std::vector<aabb3f> nodeboxes = n.getCollisionBoxes(gamedef->ndef());
                        for(std::vector<aabb3f>::iterator
                                        i = nodeboxes.begin();
                                        i != nodeboxes.end(); i++)
@@ -275,8 +279,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
                                is_object.push_back(false);
                        }
                }
-               catch(InvalidPositionException &e)
-               {
+               else {
                        // Collide with unloaded nodes
                        aabb3f box = getNodeBox(p, BS);
                        cboxes.push_back(box);