summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b9c7385)
static int status_id;
static int player_id;
static int status_id;
static int player_id;
-/* Create a layout for some demo info. If d is NULL, try to reserve enough
- * space. */
-
static int gui_demo_status(int id, const struct demo *d)
{
char noname[MAXNAM];
static int gui_demo_status(int id, const struct demo *d)
{
char noname[MAXNAM];
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
-/* Play demo from command line. */
-static int simple_play;
-
-void demo_play_goto(int simple)
+void demo_play_goto(int s)
}
static int demo_play_enter(void)
}
static int demo_play_enter(void)
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
-#define DEMO_KEEP 0
-#define DEMO_DEL 1
-#define DEMO_QUIT 2
-#define DEMO_REPLAY 3
+#define DEMO_KEEP 0
+#define DEMO_DEL 1
+#define DEMO_QUIT 2
+#define DEMO_REPLAY 3
#define DEMO_CONTINUE 4
static int demo_end_action(int i)
#define DEMO_CONTINUE 4
static int demo_end_action(int i)
kd = gui_label(id, _("Replay Paused"), GUI_LRG, GUI_ALL,
gui_gry, gui_red);
else
kd = gui_label(id, _("Replay Paused"), GUI_LRG, GUI_ALL,
gui_gry, gui_red);
else
- kd = gui_label(id, _("Replay Ends"), GUI_LRG, GUI_ALL,
+ kd = gui_label(id, _("Replay Ends"), GUI_LRG, GUI_ALL,
gui_gry, gui_red);
if ((jd = gui_harray(id)))
{
int start_id = 0;
gui_gry, gui_red);
if ((jd = gui_harray(id)))
{
int start_id = 0;
{
start_id = gui_start(jd, _("Quit"), GUI_SML, DEMO_QUIT, 1);
}
{
start_id = gui_start(jd, _("Quit"), GUI_SML, DEMO_QUIT, 1);
}
if (config_tst_d(CONFIG_JOYSTICK_BUTTON_A, b))
return demo_end_action(gui_token(gui_click()));
if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
if (config_tst_d(CONFIG_JOYSTICK_BUTTON_A, b))
return demo_end_action(gui_token(gui_click()));
if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
- return demo_end_action(demo_paused
- ? DEMO_CONTINUE
- : (simple_play ? DEMO_QUIT : DEMO_KEEP));
+ {
+ if (demo_paused)
+ return demo_end_action(DEMO_CONTINUE);
+ else
+ return demo_end_action(standalone ? DEMO_QUIT : DEMO_KEEP);
+ }