From 70956dca6fe6dc8c5dda2037a68c119fccf2f657 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 5 Aug 2017 12:31:58 -0500 Subject: [PATCH] add new variables for "content dir" --- config.def.h | 5 +++++ configuration.c | 5 +++++ configuration.h | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/config.def.h b/config.def.h index 86d2475636..f426c5b61b 100644 --- a/config.def.h +++ b/config.def.h @@ -295,6 +295,11 @@ static bool default_auto_shaders_enable = true; static bool default_sort_savefiles_enable = false; static bool default_sort_savestates_enable = false; +static bool default_savestates_in_content_dir = false; +static bool default_savefiles_in_content_dir = false; +static bool default_systemfiles_in_content_dir = false; +static bool default_screenshots_in_content_dir = false; + #if defined(__CELLOS_LV2__) || defined(_XBOX1) || defined(_XBOX360) static unsigned menu_toggle_gamepad_combo = INPUT_TOGGLE_L3_R3; #elif defined(VITA) diff --git a/configuration.c b/configuration.c index 1704386fbb..0e7482f967 100644 --- a/configuration.c +++ b/configuration.c @@ -1258,6 +1258,11 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("audio_wasapi_float_format", &settings->bools.audio_wasapi_float_format, true, wasapi_float_format, false); #endif + SETTING_BOOL("savestates_in_content_dir", &settings->bools.savestates_in_content_dir, true, default_savestates_in_content_dir, false); + SETTING_BOOL("savefiles_in_content_dir", &settings->bools.savefiles_in_content_dir, true, default_savefiles_in_content_dir, false); + SETTING_BOOL("systemfiles_in_content_dir", &settings->bools.systemfiles_in_content_dir, true, default_systemfiles_in_content_dir, false); + SETTING_BOOL("screenshots_in_content_dir", &settings->bools.screenshots_in_content_dir, true, default_screenshots_in_content_dir, false); + if (global) { SETTING_BOOL("custom_bgm_enable", &global->console.sound.system_bgm_enable, true, false, false); diff --git a/configuration.h b/configuration.h index 8d20c8daaf..4486bd6913 100644 --- a/configuration.h +++ b/configuration.h @@ -209,6 +209,11 @@ typedef struct settings bool sort_savestates_enable; bool config_save_on_exit; bool show_hidden_files; + + bool savefiles_in_content_dir; + bool savestates_in_content_dir; + bool screenshots_in_content_dir; + bool systemfiles_in_content_dir; #ifdef HAVE_LAKKA bool ssh_enable; bool samba_enable;