This commit is contained in:
twinaphex 2016-07-25 07:33:41 +02:00
parent f1c9ed29b3
commit 5ee8e25d70
3 changed files with 6 additions and 7 deletions

View File

@ -368,6 +368,10 @@ static const bool def_mouse_enable = true;
static const bool def_mouse_enable = false; static const bool def_mouse_enable = false;
#endif #endif
#ifdef HAVE_CHEEVOS
static const bool cheevos_enable = false;
#endif
/* VIDEO */ /* VIDEO */
#if defined(_XBOX360) #if defined(_XBOX360)

View File

@ -684,7 +684,7 @@ static void config_set_defaults(void)
settings->camera.allow = false; settings->camera.allow = false;
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
settings->cheevos.enable = false; settings->cheevos.enable = cheevos_enable;
settings->cheevos.test_unofficial = false; settings->cheevos.test_unofficial = false;
settings->cheevos.hardcore_mode_enable = false; settings->cheevos.hardcore_mode_enable = false;
*settings->cheevos.username = '\0'; *settings->cheevos.username = '\0';
@ -2689,11 +2689,6 @@ bool config_save_file(const char *path)
{ "video_smooth", settings->video.smooth}, { "video_smooth", settings->video.smooth},
{ "video_threaded", settings->video.threaded}, { "video_threaded", settings->video.threaded},
{ "video_shared_context", settings->video.shared_context}, { "video_shared_context", settings->video.shared_context},
#ifdef HAVE_CHEEVOS
{ "cheevos_enable", settings->cheevos.enable},
{ "cheevos_test_unofficial", settings->cheevos.test_unofficial},
{ "cheevos_hardcore_mode_enable", settings->cheevos.hardcore_mode_enable},
#endif
{ "custom_bgm_enable", global->console.sound.system_bgm_enable}, { "custom_bgm_enable", global->console.sound.system_bgm_enable},
{ "auto_screenshot_filename", settings->auto_screenshot_filename}, { "auto_screenshot_filename", settings->auto_screenshot_filename},
{ "video_force_srgb_disable", settings->video.force_srgb_disable}, { "video_force_srgb_disable", settings->video.force_srgb_disable},

View File

@ -7310,7 +7310,7 @@ static bool setting_append_list(
&settings->cheevos.enable, &settings->cheevos.enable,
msg_hash_to_str(MENU_ENUM_LABEL_CHEEVOS_ENABLE), msg_hash_to_str(MENU_ENUM_LABEL_CHEEVOS_ENABLE),
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ENABLE), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ENABLE),
false, cheevos_enable,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF),
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON),
&group_info, &group_info,