X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=share%2Fst_resol.c;h=c3ebaa3c01b49f4cf2f3818f8d45631016ed2345;hb=9173c3e24843b7d0843a3652dd0bdaf050d35178;hp=046855a3fd867dd63394bf10fe72b599a2fc36df;hpb=9b2bd6f718c68515034142006636010ca3609bf2;p=neverball diff --git a/share/st_resol.c b/share/st_resol.c index 046855a..c3ebaa3 100644 --- a/share/st_resol.c +++ b/share/st_resol.c @@ -58,13 +58,12 @@ static int resol_action(int i) static int resol_enter(void) { int id, jd; - int i; back_init("back/gui.png", config_get_d(CONFIG_GEOMETRY)); modes = SDL_ListModes(NULL, SDL_OPENGL | SDL_FULLSCREEN); - if ((int) modes == -1) + if (modes == (SDL_Rect **) -1) modes = NULL; if ((id = gui_vstack(0))) @@ -72,13 +71,17 @@ static int resol_enter(void) if ((jd = gui_harray(id))) { gui_label(jd, _("Resolution"), GUI_SML, GUI_ALL, 0, 0); - gui_filler(jd); - gui_start(jd, _("Back"), GUI_SML, RESOL_BACK, 0); + gui_space(jd); + gui_start(jd, _("Back"), GUI_SML, RESOL_BACK, 0); } + gui_space(id); + if (modes) { - for(i = 0; modes[i]; i++) + int i; + + for (i = 0; modes[i]; i++) { char s[20]; @@ -117,13 +120,12 @@ static void resol_paint(int id, float st) back_draw(0); } config_pop_matrix(); - gui_paint(id, 0); + gui_paint(id); } static void resol_timer(int id, float dt) { gui_timer(id, dt); - audio_timer(dt); } static void resol_point(int id, int x, int y, int dx, int dy) @@ -175,6 +177,7 @@ struct state st_resol = { resol_timer, resol_point, resol_stick, + NULL, resol_click, resol_keybd, resol_buttn,