From 48373bfc88aa93605436dea92aed7318bb6d5a3c Mon Sep 17 00:00:00 2001 From: otavepto Date: Sun, 21 Apr 2024 21:33:08 +0200 Subject: [PATCH] make the preowned IDs opt-out option --- CHANGELOG.md | 2 +- dll/settings_parser.cpp | 16 +++++++++------- .../configs.main.EXAMPLE.ini | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb6c57c0..761c9992 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,7 @@ check its own dedicated readme * **[breaking]** changed the environment variable `SteamAppPath` to `GseAppPath`, which is used to override the program path detected by the emu * **[breaking]** removed the setting `disable_account_avatar` in favor of the new one `enable_account_avatar`, this feature is now disabled by default -* new option `add_steam_preowned_ids` in `configs.main.ini` which allows adding a lot of Steam builtin and preowned IDs to the DLC list, and the emu's list of installed apps +* new option `disable_steam_preowned_ids` in `configs.main.ini` which prevents adding a lot of Steam builtin and preowned IDs to the DLC list, and the emu's list of installed apps * added a workaround for Steam Input, set `disable_steamoverlaygameid_env_var=1` inside `configs.main.ini`, might not work though * reverted the changes to `Steam_Apps::BIsAppInstalled()`, now it will return true when the given app id is found in the DLC list, this function is also controlled via `installed_app_ids.txt` * removed the limit on the amount of characters for local saves diff --git a/dll/settings_parser.cpp b/dll/settings_parser.cpp index 6c08d9e4..b52ca245 100644 --- a/dll/settings_parser.cpp +++ b/dll/settings_parser.cpp @@ -1193,11 +1193,11 @@ static void parse_overlay_general_config(class Settings *settings_client, class } -// main::misc::add_steam_preowned_ids +// main::misc::disable_steam_preowned_ids static void parse_steam_preowned_ids(class Settings *settings_client, class Settings *settings_server) { - bool add_steam_preowned_ids = ini.GetBoolValue("main::misc", "add_steam_preowned_ids"); - if (add_steam_preowned_ids) { + bool disable_steam_preowned_ids = ini.GetBoolValue("main::misc", "disable_steam_preowned_ids", false); + if (!disable_steam_preowned_ids) { settings_client->addSteamPreownedIds(); settings_server->addSteamPreownedIds(); PRINT_DEBUG("added Steam preowned IDs"); @@ -1458,24 +1458,26 @@ uint32 create_localstorage_settings(Settings **settings_client_out, Settings **s parse_build_id(settings_client, settings_server); parse_simple_features(settings_client, settings_server); + parse_dlc(settings_client, settings_server); + parse_installed_app_Ids(settings_client, settings_server); parse_app_paths(settings_client, settings_server, program_path); + parse_steam_preowned_ids(settings_client, settings_server); + parse_leaderboards(settings_client, settings_server); parse_stats(settings_client, settings_server); parse_depots(settings_client, settings_server); parse_subscribed_groups(settings_client, settings_server); - parse_installed_app_Ids(settings_client, settings_server); load_subscribed_groups_clans(local_storage->get_global_settings_path(), settings_client, settings_server); load_subscribed_groups_clans(steam_settings_path, settings_client, settings_server); - load_overlay_appearance(settings_client, settings_server, local_storage); - parse_mods_folder(settings_client, settings_server, local_storage); load_gamecontroller_settings(settings_client); parse_auto_accept_invite(settings_client, settings_server); parse_ip_country(settings_client, settings_server); + parse_overlay_general_config(settings_client, settings_server); - parse_steam_preowned_ids(settings_client, settings_server); + load_overlay_appearance(settings_client, settings_server, local_storage); *settings_client_out = settings_client; *settings_server_out = settings_server; diff --git a/post_build/steam_settings.EXAMPLE/configs.main.EXAMPLE.ini b/post_build/steam_settings.EXAMPLE/configs.main.EXAMPLE.ini index a28b326f..833929b6 100644 --- a/post_build/steam_settings.EXAMPLE/configs.main.EXAMPLE.ini +++ b/post_build/steam_settings.EXAMPLE/configs.main.EXAMPLE.ini @@ -67,4 +67,4 @@ disable_steamoverlaygameid_env_var=0 # https://developer.valvesoftware.com/wiki/Steam_Application_IDs # https://developer.valvesoftware.com/wiki/Dedicated_Servers_List # default=0 -add_steam_preowned_ids=0 \ No newline at end of file +disable_steam_preowned_ids=0