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

use the setting instead of always trying to use per-game options

This commit is contained in:
radius 2015-11-15 12:29:19 -05:00
parent 04287bdf51
commit 02f43ba0a1
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dynamic.c
View File

@ -721,8 +721,12 @@ bool rarch_environment_cb(unsigned cmd, void *data)
"retroarch-core-options.cfg", sizeof(buf)); "retroarch-core-options.cfg", sizeof(buf));
options_path = buf; options_path = buf;
} }
char *game_options_path = NULL; char *game_options_path = NULL;
bool ret = rarch_game_specific_options(&game_options_path); bool ret = false;
if (settings->game_specific_options)
ret = rarch_game_specific_options(&game_options_path);
if(ret) if(ret)
system->core_options = core_option_new(game_options_path, vars); system->core_options = core_option_new(game_options_path, vars);

14
menu/menu_setting.c
View File

@ -3477,6 +3477,20 @@ static bool setting_append_list_configuration_options(
general_write_handler, general_write_handler,
general_read_handler); general_read_handler);
CONFIG_BOOL(
settings->game_specific_options,
menu_hash_to_str(MENU_LABEL_GAME_SPECIFIC_OPTIONS),
menu_hash_to_str(MENU_LABEL_VALUE_GAME_SPECIFIC_OPTIONS),
default_game_specific_options,
menu_hash_to_str(MENU_VALUE_OFF),
menu_hash_to_str(MENU_VALUE_ON),
group_info.name,
subgroup_info.name,
parent_group,
general_write_handler,
general_read_handler);
CONFIG_BOOL( CONFIG_BOOL(
settings->auto_overrides_enable, settings->auto_overrides_enable,
menu_hash_to_str(MENU_LABEL_AUTO_OVERRIDES_ENABLE), menu_hash_to_str(MENU_LABEL_AUTO_OVERRIDES_ENABLE),