X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=lib%2Fspecial%2Fcollision.cpp;h=46ed0bf796152269a29f24133dc541d585e56831;hb=8e0bad9f82ccbc811a18edd7ce6c6f69c5bca082;hp=b192dc37b35b79d7e2940c9b7834f31ff798139b;hpb=8e13f4a4c6f373f40549f90cd2212815fd0d6eb7;p=supertux.git diff --git a/lib/special/collision.cpp b/lib/special/collision.cpp index b192dc37b..46ed0bf79 100644 --- a/lib/special/collision.cpp +++ b/lib/special/collision.cpp @@ -38,7 +38,11 @@ Collision::rectangle_rectangle(CollisionHit& hit, const Rectangle& r1, hit.normal.y = 0; } else { if(movement.y > -DELTA && movement.y < DELTA) { - return false; + hit.time = 0; + hit.depth = 0; + hit.normal.x = 1; + hit.normal.y = 0; + return true; } hit.time = FLT_MAX; } @@ -142,7 +146,6 @@ Collision::rectangle_aatriangle(CollisionHit& hit, const Rectangle& rect, return false; float time = depth / -(normal * movement); if(time < hit.time) { - printf("Time: %f.\n", time); hit.depth = depth; hit.time = time; hit.normal = normal;