mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup some RARCH_CTL_ actions

Browse Source
This commit is contained in:
twinaphex 2019-11-18 06:32:23 +01:00
parent db9a067e64
commit 9555f70440
2 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
retroarch.c
View File

@ -1612,10 +1612,7 @@ void path_init_savefile(void)
bool should_sram_be_used = rarch_ctl(RARCH_CTL_IS_SRAM_USED, NULL)
&& !rarch_ctl(RARCH_CTL_IS_SRAM_SAVE_DISABLED, NULL);
if (should_sram_be_used)
rarch_ctl(RARCH_CTL_SET_SRAM_ENABLE_FORCE, NULL);
else
rarch_ctl(RARCH_CTL_UNSET_SRAM_ENABLE, NULL);
rarch_use_sram = should_sram_be_used;
if (!rarch_ctl(RARCH_CTL_IS_SRAM_USED, NULL))
{
@ -5488,7 +5485,10 @@ static bool event_init_content(void)
bool contentless = false;
bool is_inited = false;
rarch_ctl(RARCH_CTL_SET_SRAM_ENABLE, NULL);
content_get_status(&contentless, &is_inited);
rarch_use_sram = (current_core_type == CORE_TYPE_PLAIN)
&& !contentless;
/* No content to be loaded for dummy core,
* just successfully exit. */
@ -5496,6 +5496,7 @@ static bool event_init_content(void)
return true;
content_set_subsystem_info();
content_get_status(&contentless, &is_inited);
if (!contentless)
@ -25128,21 +25129,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
return rarch_is_sram_save_disabled;
case RARCH_CTL_IS_SRAM_USED:
return rarch_use_sram;
case RARCH_CTL_SET_SRAM_ENABLE:
{
bool contentless = false;
bool is_inited = false;
content_get_status(&contentless, &is_inited);
rarch_use_sram = (current_core_type == CORE_TYPE_PLAIN)
&& !contentless;
}
break;
case RARCH_CTL_SET_SRAM_ENABLE_FORCE:
rarch_use_sram = true;
break;
case RARCH_CTL_UNSET_SRAM_ENABLE:
rarch_use_sram = false;
break;
case RARCH_CTL_SET_BLOCK_CONFIG_READ:
rarch_block_config_read = true;
break;

3
retroarch.h
View File

@ -101,9 +101,6 @@ enum rarch_ctl_state
RARCH_CTL_UNSET_IPS_PREF,
RARCH_CTL_IS_SRAM_USED,
RARCH_CTL_SET_SRAM_ENABLE,
RARCH_CTL_SET_SRAM_ENABLE_FORCE,
RARCH_CTL_UNSET_SRAM_ENABLE,
RARCH_CTL_IS_SRAM_LOAD_DISABLED,
RARCH_CTL_IS_SRAM_SAVE_DISABLED,