piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 05:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use Slot in EXI devices

Browse Source
This commit is contained in:
Pokechu22
2022-01-11 11:17:47 -08:00
parent 3f0b23ed2b
commit 777bb4d82c
25 changed files with 219 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinQt/GameList/GameList.cpp
View File

@ -677,9 +677,7 @@ void GameList::OpenGCSaveFolder()
SConfig::GetDirectoryForRegion(game->GetRegion()),
slot == Slot::A ? "Card A" : "Card B");
std::string override_path = slot == Slot::A ?
Config::Get(Config::MAIN_GCI_FOLDER_A_PATH_OVERRIDE) :
Config::Get(Config::MAIN_GCI_FOLDER_B_PATH_OVERRIDE);
std::string override_path = Config::Get(Config::GetInfoForGCIPathOverride(slot));
if (!override_path.empty())
path = override_path;
@ -697,8 +695,7 @@ void GameList::OpenGCSaveFolder()
}
case ExpansionInterface::EXIDeviceType::MemoryCard:
{
std::string memcard_path = slot == Slot::A ? Config::Get(Config::MAIN_MEMCARD_A_PATH) :
Config::Get(Config::MAIN_MEMCARD_B_PATH);
std::string memcard_path = Config::Get(Config::GetInfoForMemcardPath(slot));
std::string memcard_dir;

12
Source/Core/DolphinQt/Settings/GameCubePane.cpp
View File

@ -387,11 +387,11 @@ void GameCubePane::OnConfigPressed(int slot)
ExpansionInterface::ChangeDevice(
// SlotB is on channel 1, slotA and SP1 are on 0
slot,
// SP1 is device 2, slots are device 0
0,
// The device enum to change to
memcard ? ExpansionInterface::EXIDeviceType::MemoryCard :
ExpansionInterface::EXIDeviceType::AGP,
// SP1 is device 2, slots are device 0
0);
ExpansionInterface::EXIDeviceType::AGP);
}
}
@ -501,10 +501,10 @@ void GameCubePane::SaveSettings()
ExpansionInterface::ChangeDevice(
// SlotB is on channel 1, slotA and SP1 are on 0
(i == 1) ? 1 : 0,
// The device enum to change to
dev,
// SP1 is device 2, slots are device 0
(i == 2) ? 2 : 0);
(i == 2) ? 2 : 0,
// The device enum to change to
dev);
}
Config::SetBaseOrCurrent(Config::GetInfoForEXIDevice(static_cast<ExpansionInterface::Slot>(i)),