X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollision.cpp;h=6ff22952bf3c6015d3881ed2b58f64a9c5741a23;hb=c8eb3938f7b08c5f91f42c1f8ad91e5567817a4d;hp=6e989406115ba8cae034b449e035378af319db4c;hpb=7c579d3ef0a6667c18b53dad84c63c05d2760a84;p=supertux.git

diff --git a/src/collision.cpp b/src/collision.cpp
index 6e9894061..6ff22952b 100644
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -23,9 +23,9 @@
 
 #include <algorithm>
 #include <iostream>
-#include <cstdio>
-#include <cfloat>
-#include <cmath>
+#include <stdio.h>
+#include <float.h>
+#include <math.h>
 #include "math/vector.hpp"
 #include "math/aatriangle.hpp"
 #include "math/rect.hpp"
@@ -61,7 +61,7 @@ namespace {
 }
 
 bool rectangle_aatriangle(Constraints* constraints, const Rect& rect,
-    const AATriangle& triangle)
+    const AATriangle& triangle, const Vector& addl_ground_movement)
 {
   if(!intersects(rect, (const Rect&) triangle))
     return false;
@@ -146,6 +146,7 @@ bool rectangle_aatriangle(Constraints* constraints, const Rect& rect,
     if(outvec.y < 0) {
       constraints->bottom = rect.get_bottom() + outvec.y;
       constraints->hit.bottom = true;
+      constraints->ground_movement += addl_ground_movement;
     } else {
       constraints->top = rect.get_top() + outvec.y;
       constraints->hit.top = true;
@@ -157,7 +158,7 @@ bool rectangle_aatriangle(Constraints* constraints, const Rect& rect,
 }
 
 void set_rectangle_rectangle_constraints(Constraints* constraints,
-        const Rect& r1, const Rect& r2)
+        const Rect& r1, const Rect& r2, const Vector& addl_ground_movement)
 {
   float itop = r1.get_bottom() - r2.get_top();
   float ibottom = r2.get_bottom() - r1.get_top();
@@ -170,6 +171,7 @@ void set_rectangle_rectangle_constraints(Constraints* constraints,
     if(itop < ibottom) {
       constraints->bottom = std::min(constraints->bottom, r2.get_top());
       constraints->hit.bottom = true;
+      constraints->ground_movement += addl_ground_movement;
     } else {
       constraints->top = std::max(constraints->top, r2.get_bottom());
       constraints->hit.top = true;