merged bad_guy patch from Matze Braun. (recycling Ricardo's stalactite patch and...

[supertux.git] / src / collision.h

diff --git a/src/collision.h b/src/collision.h
index 8f48123..410e2e8 100644 (file)
--- a/src/collision.h
+++ b/src/collision.h
@@ -19,12 +19,19 @@ enum
 {
   CO_BULLET,
   CO_BADGUY,
-  CO_BSOD,
   CO_PLAYER
 };
 
-int rectcollision(base_type* one, base_type* two);
-int rectcollision_offset(base_type* one, base_type* two, float off_x, float off_y);
+enum CollisionType {
+    COLLISION_NORMAL,
+    COLLISION_BUMP,
+    COLLISION_SQUICH
+};
+
+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). */