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 1b1b973..a227e83 100644 (file)
--- a/ball/st_conf.c
+++ b/ball/st_conf.c
@@ -24,7 +24,6 @@
 
 #include "st_conf.h"
 #include "st_title.h"
-#include "st_lang.h"
 #include "st_resol.h"
 #include "st_name.h"
 
@@ -45,9 +44,8 @@
 #define CONF_AUDHI  18
 #define CONF_AUDLO  19
 #define CONF_BACK   20
-#define CONF_LANG   21
-#define CONF_RES    22
-#define CONF_PLAYER 23
+#define CONF_RES    21
+#define CONF_PLAYER 22
 
 static int audlo_id;
 static int audhi_id;
@@ -160,10 +158,6 @@ static int conf_action(int i)
         goto_state(&st_title);
         break;
 
-    case CONF_LANG:
-        goto_state(&st_lang);
-        break;
-
     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]);
@@ -223,10 +217,11 @@ static int conf_enter(void)
             int s = config_get_d(CONFIG_SOUND_VOLUME);
             int m = config_get_d(CONFIG_MUSIC_VOLUME);
 
-            char res[20];
+            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)))
             {
@@ -302,9 +297,7 @@ 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)))
@@ -328,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);