Remove insidious F11 fullscreen toggle. That will never work under Windows.

[neverball] / ball / st_conf.c

diff --git a/ball/st_conf.c b/ball/st_conf.c
index 6b0a9b9..d0e6e70 100644 (file)
--- a/ball/st_conf.c
+++ b/ball/st_conf.c
@@ -24,33 +24,29 @@
 
 #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_RES    22
-#define CONF_PLAYER 23
-
-static int audlo_id;
-static int audhi_id;
+enum {
+    CONF_FULL = 1,
+    CONF_WIN,
+    CONF_TEXHI,
+    CONF_TEXLO,
+    CONF_GEOHI,
+    CONF_GEOLO,
+    CONF_REFON,
+    CONF_REFOF,
+    CONF_BACON,
+    CONF_BACOF,
+    CONF_SHDON,
+    CONF_SHDOF,
+    CONF_BACK,
+    CONF_RES,
+    CONF_PLAYER
+};
+
 static int music_id[11];
 static int sound_id[11];
 
@@ -138,32 +134,10 @@ static int conf_action(int i)
         goto_state(&st_conf);
         break;
 
-    case CONF_AUDHI:
-        audio_free();
-        config_set_d(CONFIG_AUDIO_RATE, 44100);
-        config_set_d(CONFIG_AUDIO_BUFF, AUDIO_BUFF_HI);
-        gui_toggle(audlo_id);
-        gui_toggle(audhi_id);
-        audio_init();
-        break;
-
-    case CONF_AUDLO:
-        audio_free();
-        config_set_d(CONFIG_AUDIO_RATE, 22050);
-        config_set_d(CONFIG_AUDIO_BUFF, AUDIO_BUFF_LO);
-        gui_toggle(audlo_id);
-        gui_toggle(audhi_id);
-        audio_init();
-        break;
-
     case CONF_BACK:
         goto_state(&st_title);
         break;
 
-    case CONF_LANG:
-        goto_state(&st_lang);
-        break;
-
     case CONF_RES:
         goto_state(&st_resol);
         break;
@@ -179,7 +153,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 +164,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]);
@@ -204,6 +178,7 @@ static int conf_enter(void)
 {
     int id, jd, kd;
 
+    game_free();
     back_init("back/gui.png", config_get_d(CONFIG_GEOMETRY));
 
     /* Initialize the configuration GUI. */
@@ -219,14 +194,14 @@ static int conf_enter(void)
             int r = config_get_d(CONFIG_REFLECTION);
             int b = config_get_d(CONFIG_BACKGROUND);
             int h = config_get_d(CONFIG_SHADOW);
-            int a = config_get_d(CONFIG_AUDIO_RATE);
             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)))
             {
@@ -264,14 +239,6 @@ static int conf_enter(void)
             }
             if ((kd = gui_harray(jd)))
             {
-                int lo = (a == 22050);
-                int hi = (a == 44100);
-
-                audlo_id = gui_state(kd, _("Low"),  GUI_SML, CONF_AUDLO, lo);
-                audhi_id = gui_state(kd, _("High"), GUI_SML, CONF_AUDHI, hi);
-            }
-            if ((kd = gui_harray(jd)))
-            {
                 /* A series of empty buttons forms the sound volume control. */
 
                 sound_id[10] = gui_state(kd, NULL, GUI_SML, 110, (s == 10));
@@ -302,9 +269,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_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)))
@@ -325,10 +290,8 @@ static int conf_enter(void)
             gui_label(jd, _("Reflection"),   GUI_SML, GUI_ALL, 0, 0);
             gui_label(jd, _("Background"),   GUI_SML, GUI_ALL, 0, 0);
             gui_label(jd, _("Shadow"),       GUI_SML, GUI_ALL, 0, 0);
-            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);