Those sets haven't been merged.

[neverball] / ball / st_fall_out.c

diff --git a/ball/st_fall_out.c b/ball/st_fall_out.c
index 4968ec8..d68f110 100644 (file)
--- a/ball/st_fall_out.c
+++ b/ball/st_fall_out.c
@@ -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,