X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=ball%2Fst_fall_out.c;h=d68f110b7b50dd4817be7c7844eeed4c88eaf7ad;hb=9a5b5f027b27b45b4926604f48cf00904b37ec64;hp=4690d8df5e4869affde34bdd8ad65835454a6af1;hpb=a236a8e1d90508f63afec61f0801aaa29a246d19;p=neverball diff --git a/ball/st_fall_out.c b/ball/st_fall_out.c index 4690d8d..d68f110 100644 --- a/ball/st_fall_out.c +++ b/ball/st_fall_out.c @@ -96,8 +96,8 @@ static int fall_out_enter(void) } else { - retry_id = gui_maybe(jd, _("Retry Level"), FALL_OUT_SAME, - lg->mode != MODE_CHALLENGE); + retry_id = gui_state(jd, _("Retry Level"), GUI_SML, + FALL_OUT_SAME, 0); } gui_maybe(jd, _("Save Replay"), FALL_OUT_SAVE, demo_saved()); @@ -106,7 +106,7 @@ static int fall_out_enter(void) if (next_id && lg->unlock) gui_focus(next_id); - else if (lg->mode != MODE_CHALLENGE) + else if (retry_id) gui_focus(retry_id); } @@ -130,12 +130,11 @@ static void fall_out_timer(int id, float dt) if (time_state() < 2.f) { + demo_play_step(); game_step(g, dt, 0); - demo_play_step(dt); } gui_timer(id, dt); - audio_timer(dt); } static int fall_out_buttn(int b, int d) @@ -167,6 +166,7 @@ struct state st_fall_out = { fall_out_timer, shared_point, shared_stick, + NULL, shared_click, NULL, fall_out_buttn,