diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2009-02-03 05:12:03 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2009-02-03 05:12:03 +0000 |
| commit | d8f71e0574c0a9de06bf53efa2ba8a4f7380ddcd (patch) | |
| tree | 550751e740d87d75ad0620aede4542cb9a31fec4 /Source/Core | |
| parent | d6c0d5b977f29560fba385a31d45c065aa8a5928 (diff) | |
default to two memcards and a standard controller in port 1
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2081 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/ConfigManager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 6ce70dece3..fba996a786 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -198,14 +198,14 @@ void SConfig::LoadSettings() ini.Get("Core", "SelectedLanguage", &m_LocalCoreStartupParameter.SelectedLanguage, 0); ini.Get("Core", "MemcardA", &m_strMemoryCardA); ini.Get("Core", "MemcardB", &m_strMemoryCardB); - ini.Get("Core", "SlotA", (int*)&m_EXIDevice[0]); - ini.Get("Core", "SlotB", (int*)&m_EXIDevice[1]); - ini.Get("Core", "SerialPort1", (int*)&m_EXIDevice[2]); + ini.Get("Core", "SlotA", (int*)&m_EXIDevice[0], EXIDEVICE_MEMORYCARD_A); + ini.Get("Core", "SlotB", (int*)&m_EXIDevice[1], EXIDEVICE_MEMORYCARD_B); + ini.Get("Core", "SerialPort1", (int*)&m_EXIDevice[2], EXIDEVICE_DUMMY); char sidevicenum[16]; for (int i = 0; i < 4; ++i) { sprintf(sidevicenum, "SIDevice%i", i); - ini.Get("Core", sidevicenum, (u32*)&m_SIDevice[i]); + ini.Get("Core", sidevicenum, (u32*)&m_SIDevice[i], i==0 ? SI_GC_CONTROLLER:SI_DUMMY); } ini.Get("Core", "RunCompareServer", &m_LocalCoreStartupParameter.bRunCompareServer, false); |