X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollision.h;h=d4f58825a5f3e2a0afdccc4a4f0170b35ab32c57;hb=5ca889b8fa8d14bcf1f215aeef105d798d15adbd;hp=6b8662c1f5f2e2547cddfbf1b6f04e93b34804e3;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git

diff --git a/src/collision.h b/src/collision.h
index 6b8662c1f..d4f58825a 100644
--- a/src/collision.h
+++ b/src/collision.h
@@ -21,14 +21,9 @@
 #ifndef __COLLISION_H__
 #define __COLLISION_H__
 
-namespace SuperTux {
 class Vector;
-class Rectangle;
+class Rect;
 class AATriangle;
-}
-
-using namespace SuperTux;
-
 class CollisionHit;
 
 class Collision
@@ -37,13 +32,13 @@ public:
   /** does collision detection between 2 rectangles. Returns true in case of
    * collision and fills in the hit structure then.
    */
-  static bool rectangle_rectangle(CollisionHit& hit, const Rectangle& r1,
-      const Vector& movement, const Rectangle& r2);
+  static bool rectangle_rectangle(CollisionHit& hit, const Rect& r1,
+      const Vector& movement, const Rect& r2);
 
   /** does collision detection between a rectangle and an axis aligned triangle
    * Returns true in case of a collision and fills in the hit structure then.
    */                                                                         
-  static bool rectangle_aatriangle(CollisionHit& hit, const Rectangle& rect,
+  static bool rectangle_aatriangle(CollisionHit& hit, const Rect& rect,
       const Vector& movement, const AATriangle& triangle);                                            
 };