}
}
-#if 0
static int name_id;
-#endif
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;
}
if ((md = gui_vstack(ld)))
{
-#if 0
name_id = gui_label(md, (d ? d->name : noname),
GUI_SML, GUI_RGT, 0, 0);
-#endif
time_id = gui_clock(md, (d ? d->timer : 35000),
GUI_SML, GUI_RGT);
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);
}
if ((kd = gui_vstack(jd)))
{
-#if 0
gui_label(kd, _("Replay"), GUI_SML, GUI_LFT, gui_wht, gui_wht);
-#endif
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))
{
const struct demo *d = demo_get(i);
-#if 0
gui_set_label(name_id, d->name);
-#endif
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));
/*---------------------------------------------------------------------------*/
-static int simple_play;
+static int simple_play; /* play demo from command line */
void demo_play_goto(int simple)
{
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);