mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-11 00:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create do_menu_oneshot function

Browse Source
This commit is contained in:
twinaphex 2014-09-29 13:33:32 +02:00
parent c7d6eaa830
commit 9d52362940
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
retroarch.c
View File

@ -3190,6 +3190,13 @@ void rarch_main_command(unsigned cmd)
} }
} }
static inline void do_limit_frame_time(void)
{
if (g_settings.fastforward_ratio >= 0.0f)
limit_frame_time();
}
#ifdef HAVE_MENU
static void do_state_check_menu_toggle(void) static void do_state_check_menu_toggle(void)
{ {
if (g_extern.is_menu) if (g_extern.is_menu)
@ -3202,6 +3209,19 @@ static void do_state_check_menu_toggle(void)
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING); rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING);
} }
static bool do_menu_oneshot(
retro_input_t input, retro_input_t old_input,
retro_input_t trigger_input)
{
if (!menu_iterate(input, old_input, trigger_input))
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
do_limit_frame_time();
return true;
}
#endif
bool rarch_main_iterate(void) bool rarch_main_iterate(void)
{ {
unsigned i; unsigned i;
@ -3226,11 +3246,7 @@ bool rarch_main_iterate(void)
do_state_check_menu_toggle(); do_state_check_menu_toggle();
if (g_extern.is_menu) if (g_extern.is_menu)
{ return do_menu_oneshot(input, old_input, trigger_input);
if (!menu_iterate(input, old_input, trigger_input))
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
goto end;
}
#endif #endif
if (g_extern.exec) if (g_extern.exec)
@ -3280,7 +3296,6 @@ bool rarch_main_iterate(void)
/* Run libretro for one frame. */ /* Run libretro for one frame. */
pretro_run(); pretro_run();
for (i = 0; i < MAX_PLAYERS; i++) for (i = 0; i < MAX_PLAYERS; i++)
{ {
if (!g_settings.input.analog_dpad_mode[i]) if (!g_settings.input.analog_dpad_mode[i])
@ -3302,9 +3317,7 @@ bool rarch_main_iterate(void)
unlock_autosave(); unlock_autosave();
#endif #endif
end: do_limit_frame_time();
if (g_settings.fastforward_ratio >= 0.0f)
limit_frame_time();
return true; return true;
} }