ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2017-05-15 04:36:48 +02:00
parent e2c7671e9f
commit 160c8167d6
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command.c
View File

@ -1395,7 +1395,7 @@ static bool command_event_init_core(enum rarch_core_type *data)
config_load_remap(); config_load_remap();
/* Per-core saves: reset redirection paths */ /* Per-core saves: reset redirection paths */
rarch_ctl(RARCH_CTL_SET_PATHS_REDIRECT, NULL); path_set_redirect();
if (!core_init()) if (!core_init())
return false; return false;

4
configuration.c
View File

@ -1507,7 +1507,7 @@ static void config_set_defaults(void)
#endif #endif
settings->floats.video_scale = scale; settings->floats.video_scale = scale;
if (rarch_ctl(RARCH_CTL_IS_FORCE_FULLSCREEN, NULL)) if (retroarch_is_forced_fullscreen())
{ {
configuration_set_bool(settings, settings->bools.video_fullscreen, true); configuration_set_bool(settings, settings->bools.video_fullscreen, true);
} }
@ -2245,7 +2245,7 @@ static bool config_load_file(const char *path, bool set_defaults,
*bool_settings[i].ptr = tmp; *bool_settings[i].ptr = tmp;
} }
if (!rarch_ctl(RARCH_CTL_IS_FORCE_FULLSCREEN, NULL)) if (!retroarch_is_forced_fullscreen())
CONFIG_GET_BOOL_BASE(conf, settings, bools.video_fullscreen, "video_fullscreen"); CONFIG_GET_BOOL_BASE(conf, settings, bools.video_fullscreen, "video_fullscreen");
#ifdef HAVE_NETWORKGAMEPAD #ifdef HAVE_NETWORKGAMEPAD

15
retroarch.c
View File

@ -1436,15 +1436,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
runloop_ctl(RUNLOOP_CTL_HTTPSERVER_INIT, NULL); runloop_ctl(RUNLOOP_CTL_HTTPSERVER_INIT, NULL);
retroarch_msg_queue_init(); retroarch_msg_queue_init();
break; break;
case RARCH_CTL_SET_PATHS_REDIRECT:
{
bool contentless = false;
bool is_inited = false;
content_get_status(&contentless, &is_inited);
path_set_redirect();
}
break;
case RARCH_CTL_IS_SRAM_LOAD_DISABLED: case RARCH_CTL_IS_SRAM_LOAD_DISABLED:
return rarch_is_sram_load_disabled; return rarch_is_sram_load_disabled;
case RARCH_CTL_SET_SRAM_LOAD_DISABLED: case RARCH_CTL_SET_SRAM_LOAD_DISABLED:
@ -1478,8 +1469,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
case RARCH_CTL_UNSET_SRAM_ENABLE: case RARCH_CTL_UNSET_SRAM_ENABLE:
rarch_use_sram = false; rarch_use_sram = false;
break; break;
case RARCH_CTL_IS_FORCE_FULLSCREEN:
return rarch_force_fullscreen;
case RARCH_CTL_SET_BLOCK_CONFIG_READ: case RARCH_CTL_SET_BLOCK_CONFIG_READ:
rarch_block_config_read = true; rarch_block_config_read = true;
break; break;
@ -1496,6 +1485,10 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
return true; return true;
} }
bool retroarch_is_forced_fullscreen(void)
{
return rarch_force_fullscreen;
}
bool retroarch_override_setting_is_set(enum rarch_override_setting enum_idx, void *data) bool retroarch_override_setting_is_set(enum rarch_override_setting enum_idx, void *data)
{ {

7
retroarch.h
View File

@ -49,8 +49,6 @@ enum rarch_ctl_state
RARCH_CTL_DESTROY, RARCH_CTL_DESTROY,
RARCH_CTL_SET_PATHS_REDIRECT,
RARCH_CTL_IS_BPS_PREF, RARCH_CTL_IS_BPS_PREF,
RARCH_CTL_UNSET_BPS_PREF, RARCH_CTL_UNSET_BPS_PREF,
@ -77,9 +75,6 @@ enum rarch_ctl_state
RARCH_CTL_SET_SRAM_SAVE_DISABLED, RARCH_CTL_SET_SRAM_SAVE_DISABLED,
RARCH_CTL_UNSET_SRAM_SAVE_DISABLED, RARCH_CTL_UNSET_SRAM_SAVE_DISABLED,
/* Force fullscreen */
RARCH_CTL_IS_FORCE_FULLSCREEN,
/* Block config read */ /* Block config read */
RARCH_CTL_SET_BLOCK_CONFIG_READ, RARCH_CTL_SET_BLOCK_CONFIG_READ,
RARCH_CTL_UNSET_BLOCK_CONFIG_READ, RARCH_CTL_UNSET_BLOCK_CONFIG_READ,
@ -298,6 +293,8 @@ bool retroarch_override_setting_is_set(enum rarch_override_setting enum_idx, voi
bool retroarch_validate_game_options(char *s, size_t len, bool mkdir); bool retroarch_validate_game_options(char *s, size_t len, bool mkdir);
bool retroarch_is_forced_fullscreen(void);
void retroarch_set_current_core_type(enum rarch_core_type type, bool explicitly_set); void retroarch_set_current_core_type(enum rarch_core_type type, bool explicitly_set);
/** /**