#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;
goto_state(&st_title);
break;
- case CONF_LANG:
- goto_state(&st_lang);
- break;
-
- case CONF_RESOL:
+ case CONF_RES:
goto_state(&st_resol);
break;
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]);
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]);
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);
int s = config_get_d(CONFIG_SOUND_VOLUME);
int m = config_get_d(CONFIG_MUSIC_VOLUME);
- if ((kd = gui_harray(jd)))
- {
- gui_label(kd, _("Options"), GUI_SML, GUI_ALL, 0, 0);
- gui_filler(kd);
- }
+ char res[20], player[MAXNAM];
- /* Add mode selectors only for existing modes. */
+ 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_state(kd, _("No"), GUI_SML, CONF_WIN, (f == 0));
- gui_state(kd, _("Yes"), GUI_SML, CONF_FULL, (f == 1));
+ gui_label(kd, _("Options"), GUI_SML, GUI_ALL, 0, 0);
+ gui_filler(kd);
}
- {
- 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)))
{
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);
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);
swch_free();
jump_free();
goal_free();
- coin_free();
item_free();
ball_free();
shad_free();
part_init(GOAL_HEIGHT);
shad_init();
ball_init(g);
- coin_init(g);
item_init(g);
goal_init(g);
jump_init(g);