From 5283a1dcc6281b761453c4637796729c69fe3890 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 11 Jan 2022 22:29:03 +0100 Subject: [PATCH 1/2] Config: Add "DSP" to GetINIToSectionMap The "DSP" game INI section name was supported by BootManager.cpp before the section was ported to the new config system. For backwards compatibility, we should keep supporting it. Should fix https://bugs.dolphin-emu.org/issues/12792 --- Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp index 812b10269b..a626200f5d 100644 --- a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp @@ -90,6 +90,7 @@ static const INIToSectionMap& GetINIToSectionMap() { static const INIToSectionMap ini_to_section = { {"Core", {Config::System::Main, "Core"}}, + {"DSP", {Config::System::Main, "DSP"}}, {"Display", {Config::System::Main, "Display"}}, {"Video_Hardware", {Config::System::GFX, "Hardware"}}, {"Video_Settings", {Config::System::GFX, "Settings"}}, From 2ca37922dc7c3324586e9e74b80d6d7e0a2581a5 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 11 Jan 2022 22:38:37 +0100 Subject: [PATCH 2/2] Config: Use "Controls" section for PadType in game INIs This matches BootManager.cpp's old behavior. Note: The other settings of the "Controls" section (WiimoteSource and WiimoteSourceBB) are still handled in BootManager.cpp. --- Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp index a626200f5d..cf864b97b2 100644 --- a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp @@ -75,10 +75,10 @@ static const INIToLocationMap& GetINIToLocationMap() {{"Wii", "Language"}, {Config::SYSCONF_LANGUAGE.GetLocation()}}, {{"Core", "HLE_BS2"}, {Config::MAIN_SKIP_IPL.GetLocation()}}, {{"Core", "GameCubeLanguage"}, {Config::MAIN_GC_LANGUAGE.GetLocation()}}, - {{"Core", "PadType0"}, {Config::GetInfoForSIDevice(0).GetLocation()}}, - {{"Core", "PadType1"}, {Config::GetInfoForSIDevice(1).GetLocation()}}, - {{"Core", "PadType2"}, {Config::GetInfoForSIDevice(2).GetLocation()}}, - {{"Core", "PadType3"}, {Config::GetInfoForSIDevice(3).GetLocation()}}, + {{"Controls", "PadType0"}, {Config::GetInfoForSIDevice(0).GetLocation()}}, + {{"Controls", "PadType1"}, {Config::GetInfoForSIDevice(1).GetLocation()}}, + {{"Controls", "PadType2"}, {Config::GetInfoForSIDevice(2).GetLocation()}}, + {{"Controls", "PadType3"}, {Config::GetInfoForSIDevice(3).GetLocation()}}, }; return ini_to_location; }