break;
case HELP_DEMO_1:
- demo_replay_init(config_data("gui/demo1.nbr"), NULL);
- return goto_state(&st_help_demo);
+ if (demo_replay_init(config_data("gui/demo1.nbr"), NULL))
+ return goto_state(&st_help_demo);
break;
case HELP_DEMO_2:
- demo_replay_init(config_data("gui/demo2.nbr"), NULL);
- return goto_state(&st_help_demo);
+ if (demo_replay_init(config_data("gui/demo2.nbr"), NULL))
+ return goto_state(&st_help_demo);
break;
default:
const char *s9 = _("Lazy View");
const char *sA = _("Manual View");
const char *sC = _("Screenshot");
- const char *sD = _("Toggle Fullscreen");
-
- const char *k0 = _("Spacebar");
+
+ const char *k0 = _(SDL_GetKeyName((SDLKey) config_get_d(CONFIG_KEY_PAUSE)));
const char *k1 = _("Escape");
- const char *k2 = SDL_GetKeyName(config_get_d(CONFIG_KEY_CAMERA_1));
- const char *k3 = SDL_GetKeyName(config_get_d(CONFIG_KEY_CAMERA_2));
- const char *k4 = SDL_GetKeyName(config_get_d(CONFIG_KEY_CAMERA_3));
+ const char *k2 = SDL_GetKeyName((SDLKey) config_get_d(CONFIG_KEY_CAMERA_1));
+ const char *k3 = SDL_GetKeyName((SDLKey) config_get_d(CONFIG_KEY_CAMERA_2));
+ const char *k4 = SDL_GetKeyName((SDLKey) config_get_d(CONFIG_KEY_CAMERA_3));
const char *k6 = SDL_GetKeyName(SDLK_F10);
- const char *k7 = SDL_GetKeyName(SDLK_F11);
int jd;
gui_label(jd, sC, GUI_SML, 0, gui_wht, gui_wht);
gui_label(jd, k6, GUI_SML, 0, gui_yel, gui_yel);
}
- if ((jd = gui_harray(id)))
- {
- gui_label(jd, sD, GUI_SML, GUI_SE, gui_wht, gui_wht);
- gui_label(jd, k7, GUI_SML, GUI_SW, gui_yel, gui_yel);
- }
gui_space(id);
/*---------------------------------------------------------------------------*/
-static float real_time;
-static float demo_time;
-
static int help_demo_enter(void)
{
- real_time = -1.f;
- demo_time = 0.f;
-
game_set_fly(0.f);
return 0;
static void help_demo_timer(int id, float dt)
{
- float t;
-
- real_time += dt;
-
game_step_fade(dt);
- while (demo_time < real_time)
- if (demo_replay_step(&t))
- demo_time += t;
- else
- {
- goto_state(&st_help);
- break;
- }
+ if (!demo_replay_step(dt))
+ goto_state(&st_help);
}
static int help_demo_buttn(int b, int d)
shared_timer,
shared_point,
shared_stick,
+ shared_angle,
shared_click,
NULL,
help_buttn,
NULL,
NULL,
NULL,
+ NULL,
help_demo_buttn,
1, 0
};