X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=ball%2Fst_over.c;h=4a141b4067196a8f61cc03d3e42c558b0e616713;hb=1745b6a90dfd9e626e5c40d20c6aa595ec41d888;hp=44f025e3191029e0a154e9d48f3ade0666d2cd04;hpb=70a7d71562ecf00d04102ff6da28350910f1995a;p=neverball diff --git a/ball/st_over.c b/ball/st_over.c index 44f025e..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 "level.h" +#include "progress.h" #include "audio.h" #include "config.h" #include "demo.h" @@ -30,6 +30,9 @@ static int over_enter(void) { int id; + if (curr_mode() != MODE_CHALLENGE) + return 0; + if ((id = gui_label(0, _("GAME OVER"), GUI_LRG, GUI_ALL, gui_gry, gui_red))) { gui_layout(id, 0, 0); @@ -46,11 +49,10 @@ static int over_enter(void) static void over_timer(int id, float dt) { - if (dt > 0.f && 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) @@ -78,6 +80,7 @@ struct state st_over = { over_timer, NULL, NULL, + NULL, over_click, NULL, over_buttn,