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

Simplify core_load_game

This commit is contained in:
libretroadmin 2022-11-21 19:41:57 +01:00
parent 065cdc87ac
commit 8335e347f0
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
runloop.c
View File

@ -8442,7 +8442,6 @@ bool core_load_game(retro_ctx_load_content_info_t *load_info)
{ {
bool game_loaded = false; bool game_loaded = false;
runloop_state_t *runloop_st = &runloop_state; runloop_state_t *runloop_st = &runloop_state;
uint8_t flags = content_get_flags();
video_driver_set_cached_frame_ptr(NULL); video_driver_set_cached_frame_ptr(NULL);
@ -8458,22 +8457,22 @@ bool core_load_game(retro_ctx_load_content_info_t *load_info)
load_info->special->id, load_info->info, load_info->content->size); load_info->special->id, load_info->info, load_info->content->size);
else if (load_info && !string_is_empty(load_info->content->elems[0].data)) else if (load_info && !string_is_empty(load_info->content->elems[0].data))
game_loaded = runloop_st->current_core.retro_load_game(load_info->info); game_loaded = runloop_st->current_core.retro_load_game(load_info->info);
else if (flags & CONTENT_ST_FLAG_CORE_DOES_NOT_NEED_CONTENT) else if (content_get_flags() & CONTENT_ST_FLAG_CORE_DOES_NOT_NEED_CONTENT)
game_loaded = runloop_st->current_core.retro_load_game(NULL); game_loaded = runloop_st->current_core.retro_load_game(NULL);
if (game_loaded) if (game_loaded)
runloop_st->current_core.flags |= RETRO_CORE_FLAG_GAME_LOADED; {
else /* If 'game_loaded' is true at this point, then
runloop_st->current_core.flags &= ~RETRO_CORE_FLAG_GAME_LOADED; * core is actually running; register that any
* changes to global remap-related parameters
/* If 'game_loaded' is true at this point, then * should be reset once core is deinitialised */
* core is actually running; register that any
* changes to global remap-related parameters
* should be reset once core is deinitialised */
if (game_loaded)
input_remapping_enable_global_config_restore(); input_remapping_enable_global_config_restore();
runloop_st->current_core.flags |= RETRO_CORE_FLAG_GAME_LOADED;
return true;
}
return game_loaded; runloop_st->current_core.flags &= ~RETRO_CORE_FLAG_GAME_LOADED;
return false;
} }
bool core_get_system_info(struct retro_system_info *system) bool core_get_system_info(struct retro_system_info *system)