X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=ball%2Fst_over.c;h=4a141b4067196a8f61cc03d3e42c558b0e616713;hb=76d05f44396a09df4f90e3d22bffe75c9665619c;hp=1d486f38316b1a25ebff0326cc92b7dd1a2260d6;hpb=a236a8e1d90508f63afec61f0801aaa29a246d19;p=neverball diff --git a/ball/st_over.c b/ball/st_over.c index 1d486f3..4a141b4 100644 --- a/ball/st_over.c +++ b/ball/st_over.c @@ -15,7 +15,7 @@ #include "gui.h" #include "set.h" #include "game.h" -#include "levels.h" +#include "progress.h" #include "audio.h" #include "config.h" #include "demo.h" @@ -30,7 +30,7 @@ static int over_enter(void) { int id; - if (curr_lg()->mode != MODE_CHALLENGE) + if (curr_mode() != MODE_CHALLENGE) return 0; if ((id = gui_label(0, _("GAME OVER"), GUI_LRG, GUI_ALL, gui_gry, gui_red))) @@ -49,11 +49,10 @@ static int over_enter(void) static void over_timer(int id, float dt) { - if (curr_lg()->mode != MODE_CHALLENGE || time_state() > 3.f) + if (curr_mode() != MODE_CHALLENGE || time_state() > 3.f) goto_state(&st_start); gui_timer(id, dt); - audio_timer(dt); } static int over_click(int b, int d) @@ -81,6 +80,7 @@ struct state st_over = { over_timer, NULL, NULL, + NULL, over_click, NULL, over_buttn,