- moved some collision code into the world class, since it only acts on world data

[supertux.git] / src / collision.h

diff --git a/src/collision.h b/src/collision.h
index fa165d7..deee4b8 100644 (file)
--- a/src/collision.h
+++ b/src/collision.h
@@ -15,6 +15,7 @@
 #include "type.h"
 
 class Tile;
+class World;
 
 /* Collision objects */
 enum
@@ -32,13 +33,10 @@ enum CollisionType {
 
 bool rectcollision(base_type* one, base_type* two);
 bool rectcollision_offset(base_type* one, base_type* two, float off_x, float off_y);
+
 void collision_swept_object_map(base_type* old, base_type* current);
 bool collision_object_map(base_type* object);
 
-/* Checks for all possible collisions.
-   And calls the collision_handlers, which the collision_objects provide for this case (or not). */
-void collision_handler();
-
 /** Return a pointer to the tile at the given x/y coordinates */
 Tile* gettile(float x, float y);