X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcollision.hpp;h=a31878c88e8553dd808796598401d49b7005c093;hb=1cd7104259878cd6afbc257a452a1ab1456d4120;hp=fd90a9a340094b8570ea3d9305cb8891d2e68442;hpb=7c579d3ef0a6667c18b53dad84c63c05d2760a84;p=supertux.git

diff --git a/src/collision.hpp b/src/collision.hpp
index fd90a9a34..a31878c88 100644
--- a/src/collision.hpp
+++ b/src/collision.hpp
@@ -20,7 +20,7 @@
 #ifndef __COLLISION_H__
 #define __COLLISION_H__
 
-#include <cfloat>
+#include <float.h>
 #include "collision_hit.hpp"
 #include <limits>
 
@@ -63,10 +63,10 @@ bool intersects(const Rect& r1, const Rect& r2);
  * Returns true in case of a collision and fills in the hit structure then.
  */
 bool rectangle_aatriangle(Constraints* constraints, const Rect& rect,
-                                   const AATriangle& triangle);
+                                   const AATriangle& triangle, const Vector& addl_ground_movement = Vector(0,0));
 
 void set_rectangle_rectangle_constraints(Constraints* constraints,
-        const Rect& r1, const Rect& r2);
+        const Rect& r1, const Rect& r2, const Vector& addl_ground_movement = Vector(0,0));
 
 }