Tune caves

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

diff --git a/src/collision.cpp b/src/collision.cpp
index 674cf4ed4881224f9a282667120db0c05fa44e2b..3460b04fdb719f75072c444ae243f61a5957de0a 100644 (file)
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -72,11 +72,16 @@ collisionMoveResult collisionMoveSimple(Map *map, IGameDef *gamedef,
        
        /*
                Go through every node around the object
-               TODO: Calculate the range of nodes that need to be checked
        */
-       for(s16 y = oldpos_i.Y - 1; y <= oldpos_i.Y + 2; y++)
-       for(s16 z = oldpos_i.Z - 1; z <= oldpos_i.Z + 1; z++)
-       for(s16 x = oldpos_i.X - 1; x <= oldpos_i.X + 1; x++)
+       s16 min_x = (box_0.MinEdge.X / BS) - 2;
+       s16 min_y = (box_0.MinEdge.Y / BS) - 2;
+       s16 min_z = (box_0.MinEdge.Z / BS) - 2;
+       s16 max_x = (box_0.MaxEdge.X / BS) + 1;
+       s16 max_y = (box_0.MaxEdge.Y / BS) + 1;
+       s16 max_z = (box_0.MaxEdge.Z / BS) + 1;
+       for(s16 y = oldpos_i.Y + min_y; y <= oldpos_i.Y + max_y; y++)
+       for(s16 z = oldpos_i.Z + min_z; z <= oldpos_i.Z + max_z; z++)
+       for(s16 x = oldpos_i.X + min_x; x <= oldpos_i.X + max_x; x++)
        {
                try{
                        // Object collides into walkable nodes
@@ -177,6 +182,7 @@ collisionMoveResult collisionMoveSimple(Map *map, IGameDef *gamedef,
                                speed_f -= speed_f.dotProduct(dirs[i]) * dirs[i];
                                pos_f -= pos_f.dotProduct(dirs[i]) * dirs[i];
                                pos_f += oldpos_f.dotProduct(dirs[i]) * dirs[i];
+                               result.collides = true;
                        }
                
                }
@@ -232,6 +238,8 @@ collisionMoveResult collisionMovePrecise(Map *map, IGameDef *gamedef,
 
                if(result.touching_ground)
                        final_result.touching_ground = true;
+               if(result.collides)
+                       final_result.collides = true;
        }
        while(dtime_downcount > 0.001);