converted player to new object system

[supertux.git] / src / collision.h

diff --git a/src/collision.h b/src/collision.h
index 3f6db25..225a771 100644 (file)
--- a/src/collision.h
+++ b/src/collision.h
@@ -31,7 +31,8 @@ enum
 {
   CO_BULLET,
   CO_BADGUY,
-  CO_PLAYER
+  CO_PLAYER,
+  CO_TRAMPOLINE
 };
 
 enum CollisionType {
@@ -40,11 +41,11 @@ enum CollisionType {
     COLLISION_SQUISH
 };
 
-bool rectcollision(base_type* one, base_type* two);
-bool rectcollision_offset(base_type* one, base_type* two, float off_x, float off_y);
+bool rectcollision(const base_type& one, const base_type& two);
+bool rectcollision_offset(const base_type& one, const 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);
+bool collision_object_map(const base_type& object);
 
 /** Return a pointer to the tile at the given x/y coordinates */
 Tile* gettile(float x, float y);
@@ -53,7 +54,17 @@ Tile* gettile(float x, float y);
 bool  issolid(float x, float y);
 bool  isbrick(float x, float y);
 bool  isice(float x, float y);
+bool  isspike(float x, float y);
 bool  isfullbox(float x, float y);
 
+typedef void* (*tiletestfunction)(Tile* tile);
+/** invokes the function for each tile the baserectangle collides with. The
+ * function aborts and returns true as soon as the tiletestfunction returns
+ * != 0 then this value is returned. returns 0 if all tests failed.
+ */
+void* collision_func(const base_type& base, tiletestfunction* function);
+
+Tile* collision_goal(const base_type& base);
+
 #endif /*SUPERTUX_COLLISION_H*/