Updated WHATSNEW for 0.3.1

[supertux.git] / src / collision.cpp

diff --git a/src/collision.cpp b/src/collision.cpp
index 8ae5e91..f96fdea 100644 (file)
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -52,12 +52,12 @@ namespace {
   {
     n = Vector(p2.y-p1.y, p1.x-p2.x);
     c = -(p2 * n);
-    float nval = n.norm();             
+    float nval = n.norm();
     n /= nval;
     c /= nval;
   }
 
-  static const float DELTA = .0001;
+  static const float DELTA = .0001f;
 }
 
 bool rectangle_aatriangle(Constraints* constraints, const Rect& rect,
@@ -93,8 +93,8 @@ bool rectangle_aatriangle(Constraints* constraints, const Rect& rect,
       break;
     default:
       assert(false);
-  } 
-  
+  }
+
   switch(triangle.dir & AATriangle::DIRECTION_MASK) {
     case AATriangle::SOUTHWEST:
       p1 = Vector(rect.p1.x, rect.p2.y);
@@ -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
@@ -152,7 +152,7 @@ bool rectangle_aatriangle(Constraints* constraints, const Rect& rect,
     }
     constraints->hit.slope_normal = normal;
   }
-  
+
   return true;
 }