Merge branch 'master' of gitlab:wintermute/hackover2013-badge-firmware

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

diff --git a/badge/jumpnrun/enemies.h b/badge/jumpnrun/enemies.h
index 1cf8f06..c66a28e 100644 (file)
--- a/badge/jumpnrun/enemies.h
+++ b/badge/jumpnrun/enemies.h
@@ -14,8 +14,8 @@ struct jumpnrun_tile_range;
 struct jumpnrun_enemy;
 
 typedef struct jumpnrun_enemy_type {
-  unsigned            animation_ticks_per_frame;
-  size_t              animation_length;
+  uint8_t             animation_ticks_per_frame;
+  uint8_t             animation_length;
   badge_sprite const *animation_frames;
 
   rectangle           hitbox;
@@ -47,9 +47,10 @@ typedef struct jumpnrun_enemy {
 
 enum {
 // Do not collide with JUMPNRUN_MOVEABLE_* flags
-  JUMPNRUN_ENEMY_SPAWNED        = 4,
-  JUMPNRUN_ENEMY_UNAVAILABLE    = 8,
-  JUMPNRUN_ENEMY_EVENT_TRIGGER1 = 128
+  JUMPNRUN_ENEMY_SPAWNED        = 128,
+  JUMPNRUN_ENEMY_UNAVAILABLE    =  64,
+  JUMPNRUN_ENEMY_MOVING         =  32,
+  JUMPNRUN_ENEMY_EVENT_TRIGGER1 =  16
 };
 
 static inline rectangle    const *enemy_hitbox(jumpnrun_enemy const *enemy) { return &enemy->base.hitbox; }