X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=putt%2Fst_conf.c;h=9602852a00c20c0c9192a961e0e64cbf1aed894a;hb=a4674d61b952522a752dea8362d16e8a46d02d85;hp=944f85c2e90344c90495f27fcb98ed30155c4c6d;hpb=0f17528baaf530edc2b7b5d0f5f616d0c39f8dc7;p=neverball diff --git a/putt/st_conf.c b/putt/st_conf.c old mode 100755 new mode 100644 index 944f85c..9602852 --- a/putt/st_conf.c +++ b/putt/st_conf.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2003 Robert Kooima * * NEVERPUTT is free software; you can redistribute it and/or modify @@ -23,17 +23,12 @@ #include "st_conf.h" #include "st_all.h" -#include "st_lang.h" +#include "st_resol.h" /*---------------------------------------------------------------------------*/ #define CONF_FULL 1 #define CONF_WIN 2 -#define CONF_16x12 3 -#define CONF_12x10 4 -#define CONF_10x7 5 -#define CONF_8x6 6 -#define CONF_6x4 7 #define CONF_TEXHI 8 #define CONF_TEXLO 9 #define CONF_GEOHI 10 @@ -43,7 +38,7 @@ #define CONF_AUDHI 18 #define CONF_AUDLO 19 #define CONF_BACK 20 -#define CONF_LANG 21 +#define CONF_RESOL 21 static int audlo_id; static int audhi_id; @@ -52,7 +47,6 @@ static int sound_id[11]; static int conf_action(int i) { - int f = config_get_d(CONFIG_FULLSCREEN); int w = config_get_d(CONFIG_WIDTH); int h = config_get_d(CONFIG_HEIGHT); int s = config_get_d(CONFIG_SOUND_VOLUME); @@ -74,36 +68,6 @@ static int conf_action(int i) r = config_mode(0, w, h); goto_state(&st_conf); break; - - case CONF_16x12: - goto_state(&st_null); - r = config_mode(f, 1600, 1200); - goto_state(&st_conf); - break; - - case CONF_12x10: - goto_state(&st_null); - r = config_mode(f, 1280, 1024); - goto_state(&st_conf); - break; - - case CONF_10x7: - goto_state(&st_null); - r = config_mode(f, 1024, 768); - goto_state(&st_conf); - break; - - case CONF_8x6: - goto_state(&st_null); - r = config_mode(f, 800, 600); - goto_state(&st_conf); - break; - - case CONF_6x4: - goto_state(&st_null); - r = config_mode(f, 640, 480); - goto_state(&st_conf); - break; case CONF_TEXHI: goto_state(&st_null); @@ -163,10 +127,10 @@ static int conf_action(int i) goto_state(&st_title); break; - case CONF_LANG: - goto_state(&st_lang); - break; - + case CONF_RESOL: + goto_state(&st_resol); + break; + default: if (100 <= i && i <= 110) { @@ -207,7 +171,7 @@ static int conf_enter(void) { if ((jd = gui_varray(id))) { - int w = config_get_d(CONFIG_WIDTH); + int f = config_get_d(CONFIG_FULLSCREEN); int t = config_get_d(CONFIG_TEXTURES); int g = config_get_d(CONFIG_GEOMETRY); int h = config_get_d(CONFIG_SHADOW); @@ -223,16 +187,18 @@ static int conf_enter(void) /* Add mode selectors only for existing modes. */ - if (SDL_VideoModeOK(1600, 1200, 16, SDL_HWSURFACE)) - gui_state(jd, "1600 x 1200", GUI_SML, CONF_16x12, (w == 1600)); - if (SDL_VideoModeOK(1280, 1024, 16, SDL_HWSURFACE)) - gui_state(jd, "1280 x 1024", GUI_SML, CONF_12x10, (w == 1280)); - if (SDL_VideoModeOK(1024, 768, 16, SDL_HWSURFACE)) - gui_state(jd, "1024 x 768", GUI_SML, CONF_10x7, (w == 1024)); - if (SDL_VideoModeOK(800, 600, 16, SDL_HWSURFACE)) - gui_state(jd, "800 x 600", GUI_SML, CONF_8x6, (w == 800)); - if (SDL_VideoModeOK(640, 480, 16, SDL_HWSURFACE)) - gui_state(jd, "640 x 480", GUI_SML, CONF_6x4, (w == 640)); + 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); + } if ((kd = gui_harray(jd))) { @@ -276,7 +242,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)); @@ -289,23 +255,17 @@ 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); } if ((jd = gui_vstack(id))) { - int f = config_get_d(CONFIG_FULLSCREEN); - if ((kd = gui_harray(jd))) { gui_filler(kd); gui_start(kd, _("Back"), GUI_SML, CONF_BACK, 0); } - gui_state(jd, _("Fullscreen"), GUI_SML, CONF_FULL, (f == 1)); - gui_state(jd, _("Window"), GUI_SML, CONF_WIN, (f == 0)); - - /* This filler expands to accomodate an unknown number of modes. */ - gui_filler(jd); + gui_label(jd, _("Fullscreen"), GUI_SML, GUI_ALL, 0, 0); + gui_label(jd, _("Resolution"), GUI_SML, GUI_ALL, 0, 0); gui_label(jd, _("Textures"), GUI_SML, GUI_ALL, 0, 0); gui_label(jd, _("Geometry"), GUI_SML, GUI_ALL, 0, 0); @@ -313,7 +273,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_layout(id, 0, 0); }