X-Git-Url: https://git.rohieb.name/hackover2013-badge-firmware.git/blobdiff_plain/a7875e0dd83390a47de359df1f33a017ecb3f065..05db94c84b6f7e4ee91fd67d6e1a8d97a2b97f2e:/badge/jumpnrun/collision.h?ds=inline

diff --git a/badge/jumpnrun/collision.h b/badge/jumpnrun/collision.h
index 2ae4e10..405a4f4 100644
--- a/badge/jumpnrun/collision.h
+++ b/badge/jumpnrun/collision.h
@@ -1,21 +1,20 @@
 #ifndef INCLUDED_COLLISION_H
 #define INCLUDED_COLLISION_H
 
+#include "moveable.h"
 #include "jumpnrun.h"
 #include "../util/rectangle.h"
 #include <stdbool.h>
 
-void collision_displace(vec2d           *desired_pos,
-			rectangle const *current,
-			rectangle const *obstacle,
-			vec2d           *inertia_mod,
-			bool            *touching_ground);
+uint8_t collision_displace(vec2d             *desired_pos,
+                           jumpnrun_moveable *current,
+                           rectangle   const *obstacle,
+                           vec2d             *inertia_mod);
 
-void collisions_tiles_displace(vec2d                     *desired_position,
-			       rectangle           const *current,
-			       jumpnrun_level      const *level,
-			       jumpnrun_tile_range const *visible_tiles,
-			       vec2d                     *inertia_mod,
-			       bool                      *touching_ground);
+bool collisions_tiles_displace(vec2d                     *desired_position,
+                               jumpnrun_moveable         *thing,
+                               jumpnrun_level      const *level,
+                               jumpnrun_tile_range const *visible_tiles,
+                               vec2d                     *inertia_mod);
 
 #endif