Vergessene Dinge eingecheckt.

[hackover2013-badge-firmware.git] / badge / jumpnrun / collision.h

diff --git a/badge/jumpnrun/collision.h b/badge/jumpnrun/collision.h
index 2ae4e10..405a4f4 100644 (file)
--- a/badge/jumpnrun/collision.h
+++ b/badge/jumpnrun/collision.h
@@ -1,21 +1,20 @@
 #ifndef INCLUDED_COLLISION_H
 #define INCLUDED_COLLISION_H
 
 #ifndef INCLUDED_COLLISION_H
 #define INCLUDED_COLLISION_H
 

+#include "moveable.h"

 #include "jumpnrun.h"
 #include "../util/rectangle.h"
 #include <stdbool.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
 
 #endif