X-Git-Url: https://git.rohieb.name/hackover2013-badge-firmware.git/blobdiff_plain/1f08d48f93c1575e16ba2c11f60a014ad72a499c..5df5b3536a7e824c1340a07f3c26a7c61e78b68b:/badge/jumpnrun/jumpnrun.h?ds=inline

diff --git a/badge/jumpnrun/jumpnrun.h b/badge/jumpnrun/jumpnrun.h
index 598e8da..2437c36 100644
--- a/badge/jumpnrun/jumpnrun.h
+++ b/badge/jumpnrun/jumpnrun.h
@@ -6,9 +6,8 @@
 #include "levels.h"
 #include "tiles.h"
 
-#include "../util/fixed_point.h"
-#include "../util/rectangle.h"
 #include "../ui/sprite.h"
+#include "../util/util.h"
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -26,19 +25,11 @@ enum {
 };
 
 typedef struct jumpnrun_game_state {
-  vec2d   current_pos;
-  vec2d   inertia;
-  vec2d   inertia_mod;
-  uint8_t status;
-
-  uint8_t tick_minor;
-  uint8_t anim_frame;
-  uint8_t anim_direction;
+  jumpnrun_moveable player;
 
+  uint8_t status;
   int     left;
-
-  bool    touching_ground;
-  uint8_t jumpable_frames;
+  uint8_t anim_direction;
 
   size_t  spawned_enemies_counter;
   size_t  spawned_enemies[JUMPNRUN_MAX_SPAWNED_ENEMIES];