Change the "special" attribute name to "bonus" to fit the meaning of

[neverball] / ball / st_set.c

diff --git a/ball/st_set.c b/ball/st_set.c
index aacb320..d220b9a 100644 (file)
--- a/ball/st_set.c
+++ b/ball/st_set.c
@@ -27,11 +27,6 @@
 
 /*---------------------------------------------------------------------------*/
 
-#define SET_BACK -1
-#define SET_PREV -2
-#define SET_NEXT -3
-#define SET_NULL -4
-
 #define SET_GROUP 5 /* number of sets in one screen */
 
 static int last_set = 0;
@@ -72,17 +67,12 @@ static int set_action(int i)
 
 static void gui_set(int id, int i)
 {
-    const struct set *s = get_set(i);
-    int jd;
+    const struct set *s;
 
-    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 ((s = get_set(i)))
+        gui_state(id, _(s->name), 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)
@@ -94,10 +84,9 @@ static int set_enter(void)
 
     int id, jd, kd;
 
-
     set_init();
 
-    /* Reset last set if it do not exists */
+    /* Reset last set if it does not exist */
     if (!set_exists(last_set))
     {
         b = 0;
@@ -118,23 +107,19 @@ static int set_enter(void)
 
         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, get_set(last_set)->shot,
+                                7 * w / 16, 7 * h / 16);
 
             if ((kd = gui_varray(jd)))
             {
-                /* Display levels */
-                for (i = b * SET_GROUP; i < (b + 1) * SET_GROUP && set_exists(i); i++)
+                for (i = b * SET_GROUP; i < (b + 1) * SET_GROUP; i++)
                     gui_set(kd, i);
-
-                /* Display empty slots */
-                for(; i < (b + 1) * SET_GROUP; i++)
-                    gui_filler(kd);
             }
         }
 
         gui_space(id);
-        desc_id = gui_multi(id, " \\ \\ \\ \\ \\", GUI_SML, GUI_ALL, gui_yel, gui_wht);
+        desc_id = gui_multi(id, " \\ \\ \\ \\ \\", GUI_SML, GUI_ALL,
+                            gui_yel, gui_wht);
 
         gui_layout(id, 0, 0);
     }