Those sets haven't been merged.

[neverball] / ball / st_level.c

diff --git a/ball/st_level.c b/ball/st_level.c
index 04406d3..f523fb1 100644 (file)
--- a/ball/st_level.c
+++ b/ball/st_level.c
@@ -1,4 +1,4 @@
-/*   
+/*
  * Copyright (C) 2003 Robert Kooima
  *
  * NEVERBALL is  free software; you can redistribute  it and/or modify
@@ -23,62 +23,64 @@
 #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();
+    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 = _(curr_set()->levels[lg->level].numbername);
-           b  = set_level_extra_bonus(curr_set(), lg->level);
+            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)))
+            {
+                gui_label(kd, _(curr_set()->name), GUI_SML,
+                          GUI_ALL, gui_wht, gui_wht);
+                gui_space(kd);
+
+                if ((ld = gui_hstack(kd)))
+                {
+                    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,
+                          gui_wht, gui_wht);
+
+            }
             gui_filler(jd);
-           if ((kd = gui_vstack(jd)))
-           {
-               if (b)
-                   gui_label(kd, _("*** BONUS ***"),  GUI_MED, GUI_TOP, gui_wht, gui_grn);
-               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(kd, _(curr_set()->name),  GUI_SML, GUI_BOT, gui_wht, gui_wht);
-           }
-           gui_filler(jd);
         }
         gui_space(id);
-       
-       if (level_ok)
-           gui_multi(id, _(curr_intro()), GUI_SML, GUI_ALL, gui_wht, gui_wht);
-       else
-           gui_label(id, _("Cannot load the level file."), GUI_SML, GUI_ALL, gui_red, gui_red);
+
+        if (strlen(lg->level->message) != 0)
+            gui_multi(id, _(lg->level->message), GUI_SML, GUI_ALL, gui_wht,
+                      gui_wht);
 
         gui_layout(id, 0, 0);
     }
@@ -91,20 +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
-           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)
@@ -119,14 +112,15 @@ static int level_buttn(int b, int d)
     if (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;
 }
@@ -140,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;
 }
 
 /*---------------------------------------------------------------------------*/
@@ -152,6 +149,7 @@ struct state st_level = {
     level_timer,
     NULL,
     NULL,
+    NULL,
     level_click,
     level_keybd,
     level_buttn,
@@ -167,6 +165,7 @@ struct state st_poser = {
     NULL,
     NULL,
     NULL,
+    NULL,
     poser_buttn,
     1, 0
 };