Added a tweak to place the GUI into "recently moved" mode upon level end. This will...

[neverball] / ball / st_conf.c

diff --git a/ball/st_conf.c b/ball/st_conf.c
index 01d7a94..a227e83 100644 (file)
--- a/ball/st_conf.c
+++ b/ball/st_conf.c
@@ -1,4 +1,4 @@
-/*   
+/*
  * Copyright (C) 2003 Robert Kooima
  *
  * NEVERBALL is  free software; you can redistribute  it and/or modify
@@ -24,30 +24,28 @@
 
 #include "st_conf.h"
 #include "st_title.h"
-#include "st_lang.h"
 #include "st_resol.h"
 #include "st_name.h"
 
 /*---------------------------------------------------------------------------*/
 
-#define CONF_FULL  1
-#define CONF_WIN   2
-#define CONF_TEXHI 8
-#define CONF_TEXLO 9
-#define CONF_GEOHI 10
-#define CONF_GEOLO 11
-#define CONF_REFON 12
-#define CONF_REFOF 13
-#define CONF_BACON 14
-#define CONF_BACOF 15
-#define CONF_SHDON 16
-#define CONF_SHDOF 17
-#define CONF_AUDHI 18
-#define CONF_AUDLO 19
-#define CONF_BACK  20
-#define CONF_LANG  21
-#define CONF_RESOL 22
-#define CONF_PLAYER 23
+#define CONF_FULL   1
+#define CONF_WIN    2
+#define CONF_TEXHI  8
+#define CONF_TEXLO  9
+#define CONF_GEOHI  10
+#define CONF_GEOLO  11
+#define CONF_REFON  12
+#define CONF_REFOF  13
+#define CONF_BACON  14
+#define CONF_BACOF  15
+#define CONF_SHDON  16
+#define CONF_SHDOF  17
+#define CONF_AUDHI  18
+#define CONF_AUDLO  19
+#define CONF_BACK   20
+#define CONF_RES    21
+#define CONF_PLAYER 22
 
 static int audlo_id;
 static int audhi_id;
@@ -77,7 +75,7 @@ static int conf_action(int i)
         r = config_mode(0, w, h);
         goto_state(&st_conf);
         break;
-        
+
     case CONF_TEXHI:
         goto_state(&st_null);
         config_set_d(CONFIG_TEXTURES, 1);
@@ -159,12 +157,8 @@ static int conf_action(int i)
     case CONF_BACK:
         goto_state(&st_title);
         break;
-        
-    case CONF_LANG:
-        goto_state(&st_lang);
-        break;
-        
-    case CONF_RESOL:
+
+    case CONF_RES:
         goto_state(&st_resol);
         break;
 
@@ -179,7 +173,7 @@ static int conf_action(int i)
 
             config_set_d(CONFIG_SOUND_VOLUME, n);
             audio_volume(n, m);
-            audio_play(AUD_BUMP, 1.f);
+            audio_play(AUD_BUMPM, 1.f);
 
             gui_toggle(sound_id[n]);
             gui_toggle(sound_id[s]);
@@ -190,7 +184,7 @@ static int conf_action(int i)
 
             config_set_d(CONFIG_MUSIC_VOLUME, n);
             audio_volume(s, n);
-            audio_play(AUD_BUMP, 1.f);
+            audio_play(AUD_BUMPM, 1.f);
 
             gui_toggle(music_id[n]);
             gui_toggle(music_id[m]);
@@ -210,9 +204,10 @@ static int conf_enter(void)
 
     if ((id = gui_harray(0)))
     {
+        int f = config_get_d(CONFIG_FULLSCREEN);
+
         if ((jd = gui_varray(id)))
         {
-            int f = config_get_d(CONFIG_FULLSCREEN);
             int t = config_get_d(CONFIG_TEXTURES);
             int g = config_get_d(CONFIG_GEOMETRY);
             int r = config_get_d(CONFIG_REFLECTION);
@@ -222,26 +217,20 @@ static int conf_enter(void)
             int s = config_get_d(CONFIG_SOUND_VOLUME);
             int m = config_get_d(CONFIG_MUSIC_VOLUME);
 
+            char res[20], player[MAXNAM];
+
+            sprintf(res, "%d x %d", config_get_d(CONFIG_WIDTH),
+                    config_get_d(CONFIG_HEIGHT));
+            config_get_s(CONFIG_PLAYER, player, MAXNAM);
+
             if ((kd = gui_harray(jd)))
             {
                 gui_label(kd, _("Options"), GUI_SML, GUI_ALL, 0, 0);
                 gui_filler(kd);
             }
 
-            /* Add mode selectors only for existing modes. */
-
-            if ((kd = gui_harray(jd)))
-            {
-                gui_state(kd, _("No"), GUI_SML, CONF_WIN, (f == 0));
-                gui_state(kd, _("Yes"),  GUI_SML, CONF_FULL, (f == 1));
-            }
-            
-            {
-                static char msg[20];
-                sprintf(msg, "%d x %d", config_get_d(CONFIG_WIDTH),
-                        config_get_d(CONFIG_HEIGHT));
-                gui_state(jd, msg, GUI_SML, CONF_RESOL, 0);
-            }
+            gui_state(jd, _("Window"),   GUI_SML, CONF_WIN, (f == 0));
+            gui_state(jd, res,           GUI_SML, CONF_RES, 0);
 
             if ((kd = gui_harray(jd)))
             {
@@ -295,7 +284,7 @@ static int conf_enter(void)
             if ((kd = gui_harray(jd)))
             {
                 /* A series of empty buttons forms the music volume control. */
- 
+
                 music_id[10] = gui_state(kd, NULL, GUI_SML, 210, (m == 10));
                 music_id[ 9] = gui_state(kd, NULL, GUI_SML, 209, (m ==  9));
                 music_id[ 8] = gui_state(kd, NULL, GUI_SML, 208, (m ==  8));
@@ -308,20 +297,21 @@ static int conf_enter(void)
                 music_id[ 1] = gui_state(kd, NULL, GUI_SML, 201, (m ==  1));
                 music_id[ 0] = gui_state(kd, NULL, GUI_SML, 200, (m ==  0));
             }
-            gui_state(jd, _(language_get_name(language_from_code(config_simple_get_s(CONFIG_LANG)))), GUI_SML, CONF_LANG, 0);
-            gui_state(jd, config_simple_get_s(CONFIG_PLAYER), GUI_SML,
-                      CONF_PLAYER, 0);
+            gui_state(jd, player, GUI_SML, CONF_PLAYER, 0);
         }
+
         if ((jd = gui_vstack(id)))
         {
+
             if ((kd = gui_harray(jd)))
             {
                 gui_filler(kd);
                 gui_start(kd, _("Back"), GUI_SML, CONF_BACK, 0);
             }
 
-            gui_label(jd, _("Fullscreen"),   GUI_SML, GUI_ALL, 0, 0);
-            gui_label(jd, _("Resolution"),   GUI_SML, GUI_ALL, 0, 0);
+            gui_state(jd, _("Fullscreen"),   GUI_SML, CONF_FULL, (f == 1));
+
+            gui_filler(jd);
 
             gui_label(jd, _("Textures"),     GUI_SML, GUI_ALL, 0, 0);
             gui_label(jd, _("Geometry"),     GUI_SML, GUI_ALL, 0, 0);
@@ -331,7 +321,6 @@ static int conf_enter(void)
             gui_label(jd, _("Audio"),        GUI_SML, GUI_ALL, 0, 0);
             gui_label(jd, _("Sound Volume"), GUI_SML, GUI_ALL, 0, 0);
             gui_label(jd, _("Music Volume"), GUI_SML, GUI_ALL, 0, 0);
-            gui_label(jd, _("Language"),     GUI_SML, GUI_ALL, 0, 0);
             gui_label(jd, _("Player Name"),  GUI_SML, GUI_ALL, 0, 0);
         }
         gui_layout(id, 0, 0);
@@ -379,7 +368,7 @@ static int null_enter(void)
     swch_free();
     jump_free();
     goal_free();
-    coin_free();
+    item_free();
     ball_free();
     shad_free();
     part_free();
@@ -394,7 +383,7 @@ static void null_leave(int id)
     part_init(GOAL_HEIGHT);
     shad_init();
     ball_init(g);
-    coin_init(g);
+    item_init(g);
     goal_init(g);
     jump_init(g);
     swch_init(g);