if ((jd = gui_vstack(id)))
{
gui_space(jd);
- gui_image(jd, demo_get(i)->shot, w / 6, h / 6);
+ gui_image(jd, demo_get(i)->level->shot, w / 6, h / 6);
nam[MAXNAM - 1] = '\0';
strncpy(nam, demo_get(i)->name, MAXNAM);
static int gui_demo_status(int id, const struct demo *d)
{
char noname[MAXNAM];
+ char levelname[MAXSTR];
const char *mode, *state;
int i, j, k;
int jd, kd, ld, md;
state = state_to_str(i);
}
}
+
+ strcpy(levelname, "M");
}
else
{
mode = mode_to_str(d->mode);
state = state_to_str(d->state);
+ strcpy(levelname, _(d->level->set->name));
+ strcat(levelname, " - ");
+ strcat(levelname, d->level->repr);
}
if ((jd = gui_hstack(id)))
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);
+ level_id = gui_label(kd, (levelname), GUI_SML, GUI_RGT, 0, 0);
date_id = gui_label(kd, (d ? date_to_str(d->date) : "M"),
GUI_SML, GUI_RGT, 0, 0);
}
static void gui_demo_update_status(int i)
{
const struct demo *d = demo_get(i);
+ char levelname[MAXSTR];
+
+ strcpy(levelname, _(d->level->set->name));
+ strcat(levelname, " - ");
+ strcat(levelname, d->level->repr);
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(level_id, levelname);
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);