Those sets haven't been merged.

[neverball] / ball / st_level.c

diff --git a/ball/st_level.c b/ball/st_level.c
index 3af9f80..f523fb1 100644 (file)
--- a/ball/st_level.c
+++ b/ball/st_level.c
@@ -23,11 +23,10 @@
 #include "st_level.h"
 #include "st_play.h"
 #include "st_start.h"
+#include "st_over.h"
 
 /*---------------------------------------------------------------------------*/
 
-static int level_ok;
-
 static int level_enter(void)
 {
     int id, jd, kd, ld;
@@ -36,9 +35,6 @@ static int level_enter(void)
     int b;
     const float *textcol1, *textcol2;
 
-    /* Load the level */
-    level_ok = level_play_go();
-
     if ((id = gui_vstack(0)))
     {
         if ((jd = gui_hstack(id)))
@@ -58,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,
@@ -72,10 +78,7 @@ static int level_enter(void)
         }
         gui_space(id);
 
-        if (!level_ok)
-            gui_label(id, _("Cannot load the level file."), GUI_SML, GUI_ALL,
-                      gui_red, gui_red);
-        else if (lg->level->message[0] != '\0')
+        if (strlen(lg->level->message) != 0)
             gui_multi(id, _(lg->level->message), GUI_SML, GUI_ALL, gui_wht,
                       gui_wht);
 
@@ -90,24 +93,11 @@ 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)
 {
-    if (b < 0 && d == 1)
-    {
-        if (level_ok)
-        {
-            return goto_state(&st_play_ready);
-        }
-        else
-        {
-            level_stop(GAME_NONE, curr_clock(), curr_coins());
-            return goto_end_level();
-        }
-    }
-    return 1;
+    return (b < 0 && d == 1) ? goto_state(&st_play_ready) : 1;
 }
 
 static int level_keybd(int c, int d)
@@ -123,20 +113,13 @@ static int level_buttn(int b, int d)
     {
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_A, b))
         {
-            if (level_ok)
-            {
-                return goto_state(&st_play_ready);
-            }
-            else
-            {
-                level_stop(GAME_NONE, curr_clock(), curr_coins());
-                return goto_end_level();
-            }
+            return goto_state(&st_play_ready);
         }
         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;
@@ -151,7 +134,10 @@ static void poser_paint(int id, float st)
 
 static int poser_buttn(int c, int d)
 {
-    return (d && config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, c)) ? goto_state(&st_level) : 1;
+    if (d && config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, c))
+        return goto_state(&st_level);
+
+    return 1;
 }
 
 /*---------------------------------------------------------------------------*/
@@ -163,6 +149,7 @@ struct state st_level = {
     level_timer,
     NULL,
     NULL,
+    NULL,
     level_click,
     level_keybd,
     level_buttn,
@@ -178,6 +165,7 @@ struct state st_poser = {
     NULL,
     NULL,
     NULL,
+    NULL,
     poser_buttn,
     1, 0
 };