X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollision.cpp;h=f96fdea53d936ffdf994a74f0597f640838083d9;hb=20478842796ab18418ca69966047148dfacdf27a;hp=e9c25fb3866a53f966291da4ba1e1895650fd483;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git diff --git a/src/collision.cpp b/src/collision.cpp index e9c25fb38..f96fdea53 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -57,7 +57,7 @@ namespace { c /= nval; } - static const float DELTA = .0001; + static const float DELTA = .0001f; } bool rectangle_aatriangle(Constraints* constraints, const Rect& rect, @@ -128,7 +128,7 @@ bool rectangle_aatriangle(Constraints* constraints, const Rect& rect, std::cout << "Norm: " << normal << " Depth: " << depth << "\n"; #endif - Vector outvec = normal * (depth + 0.2); + Vector outvec = normal * (depth + 0.2f); const float RDELTA = 3; if(p1.x < area.p1.x - RDELTA || p1.x > area.p2.x + RDELTA