Deny playing bonus levels in any mode, including challenge mode. Todo: inform the...
[neverball] / ball / st_level.c
index 3229a47..63a1c75 100644 (file)
 #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;
     const char *ln;
     const struct level_game *lg = curr_lg();
     int b;
-
-    /* Load the level */
-    level_ok = level_play_go();
-
+    const float *textcol1, *textcol2;
 
     if ((id = gui_vstack(0)))
     {
-        if (lg->mode == MODE_SINGLE)
-        {
-            gui_label(id, _("Single Level"), GUI_LRG, GUI_TOP, 0, 0);
-        }
-        else if ((jd = gui_hstack(id)))
+        if ((jd = gui_hstack(id)))
         {
-            ln = lg->level->numbername;
+            ln = lg->level->repr;
             b = lg->level->is_bonus;
+            textcol1 = b ? gui_wht : 0;
+            textcol2 = b ? gui_grn : 0;
 
             gui_filler(jd);
+
             if ((kd = gui_vstack(jd)))
             {
-                if (b)
-                    gui_label(kd, _("*** BONUS ***"), GUI_MED, GUI_TOP, gui_wht,
-                              gui_grn);
+                gui_label(kd, _(curr_set()->name), GUI_SML,
+                          GUI_ALL, gui_wht, gui_wht);
+                gui_space(kd);
+
                 if ((ld = gui_hstack(kd)))
                 {
-                    if (b)
-                    {
-                        gui_label(ld, ln, GUI_LRG, 0, gui_wht, gui_grn);
-                        gui_label(ld, _("Level "), GUI_LRG, 0, gui_wht,
-                                  gui_grn);
-                    }
-                    else
-                    {
-                        gui_label(ld, ln, GUI_LRG, GUI_NE, 0, 0);
-                        gui_label(ld, _("Level "), GUI_LRG, GUI_NW, 0, 0);
-                    }
+                    gui_label(ld, ln,          GUI_LRG, GUI_NE,
+                              textcol1, textcol2);
+                    gui_label(ld, _("Level "), GUI_LRG, GUI_NW,
+                              textcol1, textcol2);
                 }
 
-                gui_label(kd, _(curr_set()->name), GUI_SML, GUI_BOT, gui_wht,
-                          gui_wht);
+                gui_label(kd, mode_to_str(lg->mode, 1), GUI_SML, GUI_BOT,
+                          gui_wht, gui_wht);
+
             }
             gui_filler(jd);
         }
         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);
 
@@ -96,20 +83,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
-            return goto_end_level();
-    }
-    else
-       return 1;
+    return (b < 0 && d == 1) ? goto_state(&st_play_ready) : 1;
 }
 
 static int level_keybd(int c, int d)
@@ -125,13 +103,14 @@ 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
-                return goto_end_level();
+            return goto_state(&st_play_ready);
         }
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
-            return goto_end_level();
+        {
+            level_stat(GAME_NONE, curr_clock(), curr_coins());
+            level_stop();
+            return goto_state(&st_over);
+        }
     }
     return 1;
 }
@@ -145,7 +124,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;
 }
 
 /*---------------------------------------------------------------------------*/