Remove some RUNLOOP_CTL actions

This commit is contained in:
twinaphex 2016-12-22 19:21:42 +01:00
parent 42307a322a
commit 0d8f7b64f5
3 changed files with 6 additions and 14 deletions

View File

@ -20,7 +20,7 @@
#include "menu_cbs.h"
#include "../verbosity.h"
#if 0
#if 1
#define DEBUG_LOG
#endif

View File

@ -294,12 +294,6 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
break;
case RUNLOOP_CTL_IS_MISSING_BIOS:
return runloop_missing_bios;
case RUNLOOP_CTL_SET_GAME_OPTIONS_ACTIVE:
runloop_game_options_active = true;
break;
case RUNLOOP_CTL_UNSET_GAME_OPTIONS_ACTIVE:
runloop_game_options_active = false;
break;
case RUNLOOP_CTL_IS_GAME_OPTIONS_ACTIVE:
return runloop_game_options_active;
case RUNLOOP_CTL_SET_FRAME_LIMIT:
@ -532,8 +526,8 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
if(ret)
{
runloop_ctl(RUNLOOP_CTL_SET_GAME_OPTIONS_ACTIVE, NULL);
runloop_core_options =
runloop_game_options_active = true;
runloop_core_options =
core_option_manager_new(game_options_path, vars);
free(game_options_path);
}
@ -554,7 +548,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
options_path = buf;
}
runloop_ctl(RUNLOOP_CTL_UNSET_GAME_OPTIONS_ACTIVE, NULL);
runloop_game_options_active = false;
if (!string_is_empty(options_path))
runloop_core_options =
@ -584,8 +578,8 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
else
core_option_manager_flush(runloop_core_options);
if (runloop_ctl(RUNLOOP_CTL_IS_GAME_OPTIONS_ACTIVE, NULL))
runloop_ctl(RUNLOOP_CTL_UNSET_GAME_OPTIONS_ACTIVE, NULL);
if (runloop_game_options_active)
runloop_game_options_active = false;
runloop_ctl(RUNLOOP_CTL_CORE_OPTIONS_FREE, NULL);
}

View File

@ -54,8 +54,6 @@ enum runloop_ctl_state
RUNLOOP_CTL_UNSET_MISSING_BIOS,
RUNLOOP_CTL_IS_GAME_OPTIONS_ACTIVE,
RUNLOOP_CTL_SET_GAME_OPTIONS_ACTIVE,
RUNLOOP_CTL_UNSET_GAME_OPTIONS_ACTIVE,
RUNLOOP_CTL_IS_NONBLOCK_FORCED,
RUNLOOP_CTL_SET_NONBLOCK_FORCED,