diff --git a/Source/Core/Core/Config/MainSettings.cpp b/Source/Core/Core/Config/MainSettings.cpp index 650592f1da..4e921ff74c 100644 --- a/Source/Core/Core/Config/MainSettings.cpp +++ b/Source/Core/Core/Config/MainSettings.cpp @@ -88,6 +88,8 @@ const Info& GetInfoForGCIPathOverride(ExpansionInterface::Slot slot return *infos[slot]; } +const Info MAIN_MEMORY_CARD_SIZE{{System::Main, "Core", "MemoryCardSize"}, -1}; + const Info MAIN_SLOT_A{ {System::Main, "Core", "SlotA"}, ExpansionInterface::EXIDeviceType::MemoryCardFolder}; const Info MAIN_SLOT_B{{System::Main, "Core", "SlotB"}, diff --git a/Source/Core/Core/Config/MainSettings.h b/Source/Core/Core/Config/MainSettings.h index 8a2b8be500..ef618b3314 100644 --- a/Source/Core/Core/Config/MainSettings.h +++ b/Source/Core/Core/Config/MainSettings.h @@ -73,6 +73,7 @@ const Info& GetInfoForAGPCartPath(ExpansionInterface::Slot slot); extern const Info MAIN_GCI_FOLDER_A_PATH_OVERRIDE; extern const Info MAIN_GCI_FOLDER_B_PATH_OVERRIDE; const Info& GetInfoForGCIPathOverride(ExpansionInterface::Slot slot); +extern const Info MAIN_MEMORY_CARD_SIZE; extern const Info MAIN_SLOT_A; extern const Info MAIN_SLOT_B; extern const Info MAIN_SERIAL_PORT_1; diff --git a/Source/Core/Core/HW/EXI/EXI.cpp b/Source/Core/Core/HW/EXI/EXI.cpp index e10403e495..eb1d99e81e 100644 --- a/Source/Core/Core/HW/EXI/EXI.cpp +++ b/Source/Core/Core/HW/EXI/EXI.cpp @@ -8,7 +8,6 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Common/IniFile.h" #include "Core/Config/MainSettings.h" #include "Core/ConfigManager.h" @@ -114,9 +113,7 @@ void Init() { u16 size_mbits = Memcard::MBIT_SIZE_MEMORY_CARD_2043; - int size_override; - IniFile gameIni = SConfig::GetInstance().LoadGameIni(); - gameIni.GetOrCreateSection("Core")->Get("MemoryCardSize", &size_override, -1); + int size_override = Config::Get(Config::MAIN_MEMORY_CARD_SIZE); if (size_override >= 0 && size_override <= 4) size_mbits = Memcard::MBIT_SIZE_MEMORY_CARD_59 << size_override; const bool shift_jis =