Those sets haven't been merged.

[neverball] / ball / st_level.c

diff --git a/ball/st_level.c b/ball/st_level.c
index 2a6702b..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
@@ -14,31 +14,73 @@
 
 #include "gui.h"
 #include "game.h"
-#include "level.h"
+#include "set.h"
+#include "levels.h"
 #include "audio.h"
 #include "config.h"
+#include "st_shared.h"
 
 #include "st_level.h"
 #include "st_play.h"
+#include "st_start.h"
 #include "st_over.h"
 
 /*---------------------------------------------------------------------------*/
 
 static int level_enter(void)
 {
-    int id, jd;
+    int id, jd, kd, ld;
+    const char *ln;
+    const struct level_game *lg = curr_lg();
+    int b;
+    const float *textcol1, *textcol2;
 
     if ((id = gui_vstack(0)))
     {
         if ((jd = gui_hstack(id)))
         {
+            ln = lg->level->repr;
+            b = lg->level->is_bonus;
+            textcol1 = b ? gui_wht : 0;
+            textcol2 = b ? gui_grn : 0;
+
             gui_filler(jd);
-            gui_count(jd, curr_level(), GUI_LRG, GUI_NE | GUI_SE);
-            gui_label(jd, _("Level "),     GUI_LRG, GUI_NW | GUI_SW, 0, 0);
+
+            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);
         }
         gui_space(id);
-        gui_multi(id, _(curr_intro()), GUI_SML, GUI_ALL, gui_wht, gui_wht);
+
+        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);
     }
@@ -48,21 +90,9 @@ static int level_enter(void)
     return id;
 }
 
-static void level_leave(int id)
-{
-    gui_delete(id);
-}
-
 static void level_timer(int id, float dt)
 {
     game_step_fade(dt);
-    audio_timer(dt);
-}
-
-static void level_paint(int id, float st)
-{
-    game_draw(0, st);
-    gui_paint(id);
 }
 
 static int level_click(int b, int d)
@@ -72,10 +102,8 @@ static int level_click(int b, int d)
 
 static int level_keybd(int c, int d)
 {
-    if (d && c == SDLK_ESCAPE)
-        goto_state(&st_over);
     if (d && c == SDLK_F12)
-        goto_state(&st_poser);
+        return goto_state(&st_poser);
     return 1;
 }
 
@@ -84,9 +112,15 @@ static int level_buttn(int b, int d)
     if (d)
     {
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_A, b))
+        {
             return goto_state(&st_play_ready);
+        }
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
+        {
+            level_stat(GAME_NONE, curr_clock(), curr_coins());
+            level_stop();
             return goto_state(&st_over);
+        }
     }
     return 1;
 }
@@ -98,20 +132,24 @@ static void poser_paint(int id, float st)
     game_draw(1, st);
 }
 
-static int poser_keybd(int c, int d)
+static int poser_buttn(int c, int d)
 {
-    return (d && c == SDLK_ESCAPE) ? goto_state(&st_level) : 1;
+    if (d && config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, c))
+        return goto_state(&st_level);
+
+    return 1;
 }
 
 /*---------------------------------------------------------------------------*/
 
 struct state st_level = {
     level_enter,
-    level_leave,
-    level_paint,
+    shared_leave,
+    shared_paint,
     level_timer,
     NULL,
     NULL,
+    NULL,
     level_click,
     level_keybd,
     level_buttn,
@@ -126,7 +164,8 @@ struct state st_poser = {
     NULL,
     NULL,
     NULL,
-    poser_keybd,
     NULL,
+    NULL,
+    poser_buttn,
     1, 0
 };