Fixed the problem that in a rare case, a set is downloaded and the neverballrc is...

[neverball] / ball / st_set.c

diff --git a/ball/st_set.c b/ball/st_set.c
index ac10cc6..663e9d5 100644 (file)
--- a/ball/st_set.c
+++ b/ball/st_set.c
@@ -35,7 +35,8 @@ static int first = 0;
 static int shot_id;
 static int desc_id;
 
-static int should_prompt = 1;
+static int do_init             = 1;
+static int do_init_audio       = 1;
 
 static int set_action(int i)
 {
@@ -44,6 +45,7 @@ static int set_action(int i)
     switch (i)
     {
     case GUI_BACK:
+        set_free();
         return goto_state(&st_title);
         break;
 
@@ -51,7 +53,7 @@ static int set_action(int i)
 
         first -= SET_STEP;
 
-        should_prompt = 0;
+        do_init = 0;
         return goto_state(&st_set);
 
         break;
@@ -60,7 +62,31 @@ static int set_action(int i)
 
         first += SET_STEP;
 
-        should_prompt = 0;
+        do_init = 0;
+        return goto_state(&st_set);
+
+        break;
+
+    case GUI_OFFIC:
+
+        first = 0;
+
+        config_set_d(CONFIG_SHOW_CONTRIBUTIONS, 0);
+
+        do_init = 1;
+        do_init_audio = 0;
+        return goto_state(&st_set);
+
+        break;
+
+    case GUI_CONTRIB:
+
+        first = 0;
+
+        config_set_d(CONFIG_SHOW_CONTRIBUTIONS, 1);
+
+        do_init = 1;
+        do_init_audio = 0;
         return goto_state(&st_set);
 
         break;
@@ -70,7 +96,7 @@ static int set_action(int i)
         break;
 
     default:
-        if (set_exists(i))
+        if (set_exists(i, 0))
         {
             set_goto(i);
             return goto_state(&st_start);
@@ -80,14 +106,18 @@ static int set_action(int i)
     return 1;
 }
 
-static void gui_set(int id, int i)
+static int gui_set(int id, int i)
 {
-    const struct set *s;
-
-    if ((s = get_set(i)))
-        gui_state(id, _(s->name), GUI_SML, i, 0);
+    if (set_exists(i, config_get_d(CONFIG_SHOW_CONTRIBUTIONS) + 1))
+    {
+        gui_state(id, set_name(i), GUI_SML, i, 0);
+        return 1;
+    }
     else
-        gui_label(id, "", GUI_SML, GUI_ALL, 0, 0);
+    {
+        return 0;
+    }
+    return 0;
 }
 
 static int set_enter(void)
@@ -99,13 +129,44 @@ static int set_enter(void)
 
     int i;
 
-    total = set_init();
+    int j, n;
+    j = n = 0;
+
+    for(i = 0; i < MAXSET; i++)
+    {
+        if (set_exists(i, 2))
+        {
+            n = 1;
+            break;
+        }
+        n = 0;
+    }
+
+    if (do_init)
+    {
+        total = set_init(config_get_d(CONFIG_SHOW_CONTRIBUTIONS));
+        if (do_init_audio)
+        {
+            audio_music_fade_to(0.5f, "bgm/inter.ogg");
+            audio_play(AUD_START, 1.f);
+              /* We need to recheck for contributions on true initialization */
+            for(i = 0; i < MAXSET; i++)
+            {
+                if (set_exists(i, 2))
+                {
+                    n = 1;
+                    break;
+                }
+                n = 0;
+            }
+        }
+    }
 
-    audio_music_fade_to(0.5f, "bgm/inter.ogg");
+    if(config_get_d(CONFIG_SHOW_CONTRIBUTIONS))
+        n = 1;
 
-    if (should_prompt)
-        audio_play(AUD_START, 1.f);
-    else should_prompt = 1;
+    do_init_audio = 1;
+    do_init = 1;
 
     if ((id = gui_vstack(0)))
     {
@@ -113,18 +174,25 @@ 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, first > 0, first + SET_STEP < total);
+            gui_back_prev_next(jd, first > 0, first + SET_STEP < total, n);
         }
 
         if ((jd = gui_harray(id)))
         {
-            shot_id = gui_image(jd, get_set(first)->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)))
             {
-                for (i = first; i < first + SET_STEP; i++)
-                    gui_set(kd, i);
+                for (i = first; i < MAXSET; i++)
+                {
+                    if(j==5)
+                        break;
+                    j += gui_set(kd, i);
+                }
+                for (i = 0; i < 5 - j && i < MAXSET; i++)
+                {
+                    gui_label(kd, "", GUI_SML, GUI_ALL, 0, 0);
+                }
             }
         }
 
@@ -139,15 +207,15 @@ 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)
 {
     int jd = shared_point_basic(id, x, y);
     int i  = gui_token(jd);
-    if (jd && set_exists(i))
+    if (jd && set_exists(i, 0))
         set_over(i);
 }
 
@@ -155,7 +223,7 @@ static void set_stick(int id, int a, int v)
 {
     int jd = shared_stick_basic(id, a, v);
     int i  = gui_token(jd);
-    if (jd && set_exists(i))
+    if (jd && set_exists(i, 0))
         set_over(i);
 }
 
@@ -180,6 +248,7 @@ struct state st_set = {
     shared_timer,
     set_point,
     set_stick,
+    shared_angle,
     shared_click,
     NULL,
     set_buttn,