X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollision.h;h=39d658b9ec08ad4bb34bee37afc38183fa4b0978;hb=8385faa306eca6d96ab11ed7dae293d85e9c4e4f;hp=3f6db2553a1a04e4ac10d9c6f7f8bc614026c092;hpb=84160722392a024dda42bd86ca9bd85b68c49457;p=supertux.git

diff --git a/src/collision.h b/src/collision.h
index 3f6db2553..39d658b9e 100644
--- a/src/collision.h
+++ b/src/collision.h
@@ -21,39 +21,36 @@
 #ifndef SUPERTUX_COLLISION_H
 #define SUPERTUX_COLLISION_H
 
-#include "type.h"
+#include "math/rectangle.h"
 
-class Tile;
-class World;
+using namespace SuperTux;
 
-/* Collision objects */
-enum
-{
-  CO_BULLET,
-  CO_BADGUY,
-  CO_PLAYER
-};
-
-enum CollisionType {
-    COLLISION_NORMAL,
-    COLLISION_BUMP,
-    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);
+#if 0
+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);
+bool collision_object_map(const Rectangle& rect);
 
 /** Return a pointer to the tile at the given x/y coordinates */
-Tile* gettile(float x, float y);
+const Tile* gettile(float x, float y);
 
 // Some little helper function to check for tile properties
 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)(const 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);
+const Tile* collision_goal(const Rectangle& rect);
+#endif
+
 #endif /*SUPERTUX_COLLISION_H*/