Remove drawball for real this time and fix an accidental regression.

[neverball] / ball / st_demo.c

diff --git a/ball/st_demo.c b/ball/st_demo.c
index b11cd92..7a3a085 100644 (file)
--- a/ball/st_demo.c
+++ b/ball/st_demo.c
@@ -101,7 +101,6 @@ static int name_id;
 static int time_id;
 static int coin_id;
 static int date_id;
-static int level_id;
 static int mode_id;
 static int state_id;
 static int player_id;
@@ -187,8 +186,6 @@ static int gui_demo_status(int id, const struct demo *d)
                     mode_id = gui_label(md, mode, GUI_SML, GUI_RGT, 0, 0);
                 }
             }
-            level_id = gui_label(kd, (d ? d->file : "M"), GUI_SML, GUI_RGT,
-                                 gui_wht, gui_wht);
             date_id = gui_label(kd, (d ? date_to_str(d->date) : "M"),
                                 GUI_SML, GUI_RGT, 0, 0);
         }
@@ -197,7 +194,6 @@ static int gui_demo_status(int id, const struct demo *d)
             gui_label(kd, _("Replay"), GUI_SML, GUI_LFT, gui_wht, gui_wht);
             gui_label(kd, _("Time"),   GUI_SML, GUI_LFT, gui_wht, gui_wht);
             gui_label(kd, _("Mode"),   GUI_SML, GUI_LFT, gui_wht, gui_wht);
-            gui_label(kd, _("Level"),  GUI_SML, GUI_LFT, gui_wht, gui_wht);
             gui_label(kd, _("Date"),   GUI_SML, GUI_LFT, gui_wht, gui_wht);
         }
         if (d && (d->state == GAME_GOAL || d->state == GAME_SPEC))
@@ -212,7 +208,6 @@ static void gui_demo_update_status(int i)
 
     gui_set_label(name_id,   d->name);
     gui_set_label(date_id,   date_to_str(d->date));
-    gui_set_label(level_id,  d->file);
     gui_set_label(player_id, d->player);
     gui_set_label(mode_id,   mode_to_str(d->mode));
 
@@ -303,7 +298,7 @@ static int demo_buttn(int b, int d)
 
 /*---------------------------------------------------------------------------*/
 
-static int simple_play;
+static int simple_play; /* play demo from command line */
 
 void demo_play_goto(int simple)
 {
@@ -444,12 +439,33 @@ static int demo_end_enter(void)
 
 static void demo_end_timer(int id, float dt)
 {
+    float t;
     float gg[3] = { 0.0f,  9.8f, 0.0f };
     float gf[3] = { 0.0f, -9.8f, 0.0f };
     int state = curr_demo_replay()->state;
 
-    if (time_state() < 2.f && state != GAME_NONE)
-        game_step((state == GAME_GOAL || state == GAME_SPEC) ? gg : gf, dt, NULL);
+    if (time_state() < 2.f)
+    {
+        /* Continue demo in background for 2 seconds */
+        if (replay_time < global_time)
+        {
+            /* The demo is finished, let the ball go */
+            if (state != GAME_NONE)
+                game_step((state == GAME_GOAL || state == GAME_SPEC) ? gg : gf,
+                          dt, NULL);
+        }
+        else
+        {
+            /* The demo is not finished, play it */
+            global_time += dt;
+
+            while (replay_time < global_time)
+                if (demo_replay_step(&t))
+                    replay_time += t;
+                else
+                    break;
+        }
+    }
 
     gui_timer(id, dt);
     audio_timer(dt);