the zlib error print function now prints to dstream (debug.txt)

[dragonfireclient.git] / src / collision.h

diff --git a/src/collision.h b/src/collision.h
index 17243140148a8686e1a1fe50974935816979eb6c..6d167bb7be415debaa192e61a3111f46b331ed32 100644 (file)
--- a/src/collision.h
+++ b/src/collision.h
@@ -33,11 +33,26 @@ struct collisionMoveResult
        {}
 };
 
+// Moves using a single iteration; speed should not exceed pos_max_d/dtime
 collisionMoveResult collisionMoveSimple(Map *map, f32 pos_max_d,
                const core::aabbox3d<f32> &box_0,
                f32 dtime, v3f &pos_f, v3f &speed_f);
-//{return collisionMoveResult();}
 
+// Moves using as many iterations as needed
+collisionMoveResult collisionMovePrecise(Map *map, f32 pos_max_d,
+               const core::aabbox3d<f32> &box_0,
+               f32 dtime, v3f &pos_f, v3f &speed_f);
+
+enum CollisionType
+{
+       COLLISION_FALL
+};
+
+struct CollisionInfo
+{
+       CollisionType t;
+       f32 speed;
+};
 
 #endif