From: Wintermute <wintermute@hannover.ccc.de>
Date: Sat, 19 Oct 2013 19:52:57 +0000 (+0200)
Subject: Schüsse nach Tod despawnen.
X-Git-Url: https://git.rohieb.name/hackover2013-badge-firmware.git/commitdiff_plain/13215f1b6fa87cb5f182e1f43c6431295654e009

Schüsse nach Tod despawnen.
---

diff --git a/Makefile b/Makefile
index 9d1938d..ac9a3d5 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,7 @@ SRCS = \
   badge/jumpnrun/jumpnrun.c \
   badge/jumpnrun/level_load.c \
   badge/jumpnrun/tiles.c \
+  badge/jumpnrun/stats.c \
   badge/ui/display.c \
   badge/ui/event.c \
   badge/ui/font.c \
diff --git a/badge/jumpnrun/jumpnrun.c b/badge/jumpnrun/jumpnrun.c
index dc1dc6c..79fa6b3 100644
--- a/badge/jumpnrun/jumpnrun.c
+++ b/badge/jumpnrun/jumpnrun.c
@@ -362,6 +362,7 @@ uint8_t jumpnrun_play(char const *lvname) {
     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());
 
diff --git a/badge/jumpnrun/lubilove.lv b/badge/jumpnrun/lubilove.lv
new file mode 100644
index 0000000..0f5653e
--- /dev/null
+++ b/badge/jumpnrun/lubilove.lv
@@ -0,0 +1,44 @@
+vvvvvvvvvvvvvvvvvvv##################################################################                  ###################
+                                                                                                                      
+                                                                                                                           
+                                                                                                                                            
+                                                                                                                          
+                                                                                  ?????       ####       k                
+                                                                                  vvvvv       vvvv    ^????     
+               #########                                                                              vvvvv                  
+              ###  #  ###                                                  ????^                                        
+             ###       ###                                                 vvvv                                            
+            #####     #####                                                                                            @    @
+  P        #######   #######                   M  M                          e      H           H                                       
+################### #########  ######^^^??##############^^##^^###^^#######################################################
+
+[tiles]
+0 tube_top_left
+1 tube_top_right
+2 tube_left
+3 tube_right
+# brick
+? square
+^ spike_up
+v spike_down
+> spike_right
+< spike_left
+
+[items]
+d doc
+c checkpoint
+k key
+e doc_encrypted
+
+[enemies]
+C cat
+M mushroom
+B bunny
+S snake
+@ spiral
+R rotor
+H dog
+G giraffe
+V bird
+W bird_straight
+X bird_dip