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

(retroarch.c) cleanups

Browse Source
This commit is contained in:
twinaphex 2014-09-02 03:21:33 +02:00
parent f085056d8a
commit 8a405fa611
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
retroarch.c
View File

@ -1513,8 +1513,7 @@ static void init_controllers(void)
{ {
/* Do not fix g_settings.input.libretro_device[i], /* Do not fix g_settings.input.libretro_device[i],
* because any use of dummy core will reset this, * because any use of dummy core will reset this,
* which is not a good idea. * which is not a good idea. */
*/
RARCH_WARN("Input device ID %u is unknown to this libretro implementation. Using RETRO_DEVICE_JOYPAD.\n", device); RARCH_WARN("Input device ID %u is unknown to this libretro implementation. Using RETRO_DEVICE_JOYPAD.\n", device);
device = RETRO_DEVICE_JOYPAD; device = RETRO_DEVICE_JOYPAD;
} }
@ -1926,9 +1925,10 @@ static void fill_pathnames(void)
g_extern.savefiles = string_list_new(); g_extern.savefiles = string_list_new();
rarch_assert(g_extern.savefiles); rarch_assert(g_extern.savefiles);
/* For subsystems, we know exactly which RAM types are supported. */
if (*g_extern.subsystem) if (*g_extern.subsystem)
{ {
/* For subsystems, we know exactly which RAM types are supported. */
unsigned i, j; unsigned i, j;
const struct retro_subsystem_info *info = const struct retro_subsystem_info *info =
(const struct retro_subsystem_info*)libretro_find_subsystem_info( (const struct retro_subsystem_info*)libretro_find_subsystem_info(
@ -2299,7 +2299,7 @@ static void check_rewind(void)
if ((cnt == 0) || g_extern.bsv.movie) if ((cnt == 0) || g_extern.bsv.movie)
{ {
void *state; void *state = NULL;
state_manager_push_where(g_extern.state_manager, &state); state_manager_push_where(g_extern.state_manager, &state);
RARCH_PERFORMANCE_INIT(rewind_serialize); RARCH_PERFORMANCE_INIT(rewind_serialize);
@ -3094,7 +3094,7 @@ static void init_sram(void)
RARCH_LOG("SRAM will not be saved.\n"); RARCH_LOG("SRAM will not be saved.\n");
} }
static void main_deinit_core(void) static void deinit_core(void)
{ {
pretro_unload_game(); pretro_unload_game();
pretro_deinit(); pretro_deinit();
@ -3188,7 +3188,7 @@ int rarch_main_init(int argc, char *argv[])
return 0; return 0;
error: error:
main_deinit_core(); deinit_core();
uninit_drivers(); uninit_drivers();
g_extern.main_is_init = false; g_extern.main_is_init = false;
@ -3627,7 +3627,7 @@ void rarch_main_deinit(void)
save_auto_state(); save_auto_state();
main_deinit_core(); deinit_core();
uninit_drivers(); uninit_drivers();
deinit_temporary_content(); deinit_temporary_content();