Fixed problem of server always receiving an empty password from the client

[dragonfireclient.git] / src / collision.cpp

diff --git a/src/collision.cpp b/src/collision.cpp
index 83cefe4d1e1a5db78db65a18281b4e0c46b4caab..3d322cf0c4baee77342ab5026e652e639e01ecb4 100644 (file)
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -70,6 +70,7 @@ collisionMoveResult collisionMoveSimple(Map *map, f32 pos_max_d,
        
        /*
                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++)
@@ -77,7 +78,8 @@ collisionMoveResult collisionMoveSimple(Map *map, f32 pos_max_d,
        {
                try{
                        // Object collides into walkable nodes
-                       if(content_walkable(map->getNode(v3s16(x,y,z)).d) == false)
+                       MapNode n = map->getNode(v3s16(x,y,z));
+                       if(content_features(n).walkable == false)
                                continue;
                }
                catch(InvalidPositionException &e)
@@ -181,4 +183,58 @@ collisionMoveResult collisionMoveSimple(Map *map, f32 pos_max_d,
        return result;
 }
 
+collisionMoveResult collisionMovePrecise(Map *map, f32 pos_max_d,
+               const core::aabbox3d<f32> &box_0,
+               f32 dtime, v3f &pos_f, v3f &speed_f)
+{
+       collisionMoveResult final_result;
+
+       // Maximum time increment (for collision detection etc)
+       // time = distance / speed
+       f32 dtime_max_increment = pos_max_d / speed_f.getLength();
+       
+       // Maximum time increment is 10ms or lower
+       if(dtime_max_increment > 0.01)
+               dtime_max_increment = 0.01;
+       
+       // Don't allow overly huge dtime
+       if(dtime > 2.0)
+               dtime = 2.0;
+       
+       f32 dtime_downcount = dtime;
+
+       u32 loopcount = 0;
+       do
+       {
+               loopcount++;
+
+               f32 dtime_part;
+               if(dtime_downcount > dtime_max_increment)
+               {
+                       dtime_part = dtime_max_increment;
+                       dtime_downcount -= dtime_part;
+               }
+               else
+               {
+                       dtime_part = dtime_downcount;
+                       /*
+                               Setting this to 0 (no -=dtime_part) disables an infinite loop
+                               when dtime_part is so small that dtime_downcount -= dtime_part
+                               does nothing
+                       */
+                       dtime_downcount = 0;
+               }
+
+               collisionMoveResult result = collisionMoveSimple(map, pos_max_d,
+                               box_0, dtime_part, pos_f, speed_f);
+
+               if(result.touching_ground)
+                       final_result.touching_ground = true;
+       }
+       while(dtime_downcount > 0.001);
+               
+
+       return final_result;
+}
+