Those sets haven't been merged.

[neverball] / ball / st_level.c

diff --git a/ball/st_level.c b/ball/st_level.c
index e84e6b1..f523fb1 100644 (file)
--- a/ball/st_level.c
+++ b/ball/st_level.c
@@ -23,6 +23,7 @@
 #include "st_level.h"
 #include "st_play.h"
 #include "st_start.h"
+#include "st_over.h"
 
 /*---------------------------------------------------------------------------*/
 
@@ -53,10 +54,20 @@ static int level_enter(void)
 
                 if ((ld = gui_hstack(kd)))
                 {
-                    gui_label(ld, ln,          GUI_LRG, GUI_NE,
-                              textcol1, textcol2);
-                    gui_label(ld, _("Level "), GUI_LRG, GUI_NW,
-                              textcol1, textcol2);
+                    if (b == 0)
+                    {
+                        gui_label(ld, ln,          GUI_LRG, GUI_NE,
+                                  textcol1, textcol2);
+                        gui_label(ld, _("Level "), GUI_LRG, GUI_NW,
+                                  textcol1, textcol2);
+                    }
+                    else
+                    {
+                        gui_label(ld, ln,                GUI_MED, GUI_NE,
+                                  textcol1, textcol2);
+                        gui_label(ld, _("Bonus Level "), GUI_MED, GUI_NW,
+                                  textcol1, textcol2);
+                    }
                 }
 
                 gui_label(kd, mode_to_str(lg->mode, 1), GUI_SML, GUI_BOT,
@@ -82,7 +93,6 @@ static int level_enter(void)
 static void level_timer(int id, float dt)
 {
     game_step_fade(dt);
-    audio_timer(dt);
 }
 
 static int level_click(int b, int d)
@@ -107,8 +117,9 @@ static int level_buttn(int b, int d)
         }
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
         {
-            level_stop(GAME_NONE, curr_clock(), curr_coins());
-            return goto_end_level();
+            level_stat(GAME_NONE, curr_clock(), curr_coins());
+            level_stop();
+            return goto_state(&st_over);
         }
     }
     return 1;
@@ -125,7 +136,7 @@ static int poser_buttn(int c, int d)
 {
     if (d && config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, c))
         return goto_state(&st_level);
-    
+
     return 1;
 }
 
@@ -138,6 +149,7 @@ struct state st_level = {
     level_timer,
     NULL,
     NULL,
+    NULL,
     level_click,
     level_keybd,
     level_buttn,
@@ -153,6 +165,7 @@ struct state st_poser = {
     NULL,
     NULL,
     NULL,
+    NULL,
     poser_buttn,
     1, 0
 };