ball/util: add a space between "back" and "prev"

[neverball] / ball / st_set.c

diff --git a/ball/st_set.c b/ball/st_set.c
index c888b25..b3b6331 100644 (file)
--- a/ball/st_set.c
+++ b/ball/st_set.c
@@ -14,7 +14,7 @@
 
 #include "gui.h"
 #include "set.h"
-#include "levels.h"
+#include "progress.h"
 #include "game.h"
 #include "audio.h"
 #include "config.h"
@@ -27,13 +27,16 @@
 
 /*---------------------------------------------------------------------------*/
 
-#define SET_GROUP 5 /* number of sets in one screen */
+#define SET_STEP    5
 
-static int last_set = 0;
+static int total = 0;
+static int first = 0;
 
 static int shot_id;
 static int desc_id;
 
+static int do_init = 1;
+
 static int set_action(int i)
 {
     audio_play(AUD_MENU, 1.0f);
@@ -41,65 +44,67 @@ static int set_action(int i)
     switch (i)
     {
     case GUI_BACK:
+        set_free();
         return goto_state(&st_title);
+        break;
 
     case GUI_PREV:
-        last_set = (last_set / SET_GROUP - 1) * SET_GROUP;
+
+        first -= SET_STEP;
+
+        do_init = 0;
         return goto_state(&st_set);
 
+        break;
+
     case GUI_NEXT:
-        last_set = (last_set / SET_GROUP + 1) * SET_GROUP;
+
+        first += SET_STEP;
+
+        do_init = 0;
         return goto_state(&st_set);
 
+        break;
+
     case GUI_NULL:
         return 1;
+        break;
 
     default:
         if (set_exists(i))
         {
-            last_set = i;
             set_goto(i);
             return goto_state(&st_start);
         }
     }
+
     return 1;
 }
 
 static void gui_set(int id, int i)
 {
-    const struct set *s = get_set(i);
-    int jd;
-
-    if (set_completed(s))
-        jd = gui_label(id, _(s->name), GUI_SML, GUI_ALL, gui_yel, gui_wht);
-    else if (set_unlocked(s))
-        jd = gui_label(id, _(s->name), GUI_SML, GUI_ALL, gui_grn, gui_wht);
+    if (set_exists(i))
+        gui_state(id, set_name(i), GUI_SML, i, 0);
     else
-        jd = gui_label(id, _(s->name), GUI_SML, GUI_ALL, gui_wht, gui_wht);
-
-    gui_active(jd, i, 0);
+        gui_label(id, "", GUI_SML, GUI_ALL, 0, 0);
 }
 
 static int set_enter(void)
 {
     int w = config_get_d(CONFIG_WIDTH);
     int h = config_get_d(CONFIG_HEIGHT);
-    int b = last_set / SET_GROUP;
-    int i;
 
     int id, jd, kd;
 
-    set_init();
+    int i;
 
-    /* Reset last set if it does not exist */
-    if (!set_exists(last_set))
+    if (do_init)
     {
-        b = 0;
-        last_set = 0;
+        total = set_init();
+        audio_music_fade_to(0.5f, "bgm/inter.ogg");
+        audio_play(AUD_START, 1.f);
     }
-
-    audio_music_fade_to(0.5f, "bgm/inter.ogg");
-    audio_play(AUD_START, 1.f);
+    else do_init = 1;
 
     if ((id = gui_vstack(0)))
     {
@@ -107,23 +112,17 @@ static int set_enter(void)
         {
             gui_label(jd, _("Level Set"), GUI_SML, GUI_ALL, gui_yel, gui_red);
             gui_filler(jd);
-            gui_back_prev_next(jd, b > 0, set_exists((b + 1) * SET_GROUP));
+            gui_navig(jd, first > 0, first + SET_STEP < total);
         }
 
         if ((jd = gui_harray(id)))
         {
-            shot_id = gui_image(jd, get_set(last_set)->shot,
-                                7 * w / 16, 7 * h / 16);
+            shot_id = gui_image(jd, set_shot(first), 7 * w / 16, 7 * h / 16);
 
             if ((kd = gui_varray(jd)))
             {
-                /* Display sets */
-                for (i = b * SET_GROUP; i < (b + 1) * SET_GROUP && set_exists(i); i++)
+                for (i = first; i < first + SET_STEP; i++)
                     gui_set(kd, i);
-
-                /* Display empty slots */
-                for(; i < (b + 1) * SET_GROUP; i++)
-                    gui_filler(kd);
             }
         }
 
@@ -138,8 +137,8 @@ static int set_enter(void)
 
 static void set_over(int i)
 {
-    gui_set_image(shot_id, get_set(i)->shot);
-    gui_set_multi(desc_id, _(get_set(i)->desc));
+    gui_set_image(shot_id, set_shot(i));
+    gui_set_multi(desc_id, set_desc(i));
 }
 
 static void set_point(int id, int x, int y, int dx, int dy)
@@ -179,6 +178,7 @@ struct state st_set = {
     shared_timer,
     set_point,
     set_stick,
+    shared_angle,
     shared_click,
     NULL,
     set_buttn,