X-Git-Url: https://git.rohieb.name/hackover2013-badge-firmware.git/blobdiff_plain/19ea4876c39cdbba20ee594c11fe350d7433c857..fae8bce84f19654e43025dd84976fedb4f87547e:/badge/jumpnrun/jumpnrun.c

diff --git a/badge/jumpnrun/jumpnrun.c b/badge/jumpnrun/jumpnrun.c
index 272ceaf..79fa6b3 100644
--- a/badge/jumpnrun/jumpnrun.c
+++ b/badge/jumpnrun/jumpnrun.c
@@ -1,6 +1,7 @@
 #include "jumpnrun.h"
 #include "collision.h"
 #include "levels.h"
+#include "stats.h"
 
 #include "../ui/display.h"
 #include "../ui/event.h"
@@ -47,6 +48,10 @@ static badge_sprite const anim_hacker[] = {
   */
 };
 
+badge_sprite const *jumpnrun_hacker_symbol(void) {
+  return &anim_hacker[0];
+}
+
 static badge_sprite const anim_sickle[] = {
   { 3, 3, (uint8_t const *) "\xab\x01" },
   { 3, 3, (uint8_t const *) "\xee\x00" }
@@ -338,13 +343,29 @@ uint8_t jumpnrun_play(char const *lvname) {
   jumpnrun_game_state gs;
   memset(&gs, 0, sizeof(gs));
 
-  for(gs.lives = 3; gs.lives != 0; --gs.lives) {
+  for(gs.lives = 99; gs.status != JUMPNRUN_WON && gs.lives != 0; --gs.lives) {
+    jumpnrun_show_lives_screen(&gs);
+
+    for(uint8_t i = 0; i < 75; ) {
+      badge_event_t ev = badge_event_wait();
+      if(badge_event_type(ev) == BADGE_EVENT_GAME_TICK) {
+        ++i;
+      } else if(i > 25) {
+        uint8_t old_state = badge_event_old_input_state(ev);
+        uint8_t new_state = badge_event_new_input_state(ev);
+        uint8_t new_buttons = new_state & (old_state ^ new_state);
+
+        if(new_buttons != 0) break;
+      }
+    }
+
     gs.status = JUMPNRUN_PLAYING;
+    gs.left = 0;
     memset(&gs.player, 0, sizeof(gs.player));
+    memset(&gs.shots , 0, sizeof(gs.shots ));
     gs.player.current_box = rectangle_new(lv.start_pos,
                                           hacker_extents());
 
-
     for(size_t i = 0; i < lv.header.enemy_count; ++i) {
       lv.enemies[i].flags = 0;
     }