diff options
| author | mathieui <mathieui@mathieui.net> | 2016-01-23 17:29:07 +0100 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2016-01-23 17:29:07 +0100 |
| commit | 5e709f3d72b5e7d1374322946cd2fde3ace26d8d (patch) | |
| tree | f08e9af8e1fe1d8103e57aaef627eb53eceba95b /Source | |
| parent | 3f5f52342a284887442c399249805283245cef4a (diff) | |
[netplay] Use the local type of each SI device
Instead of using SI_GCcontroller which would make it not work with gc
adapters, bongos, and other stuff.
Trying to fix issue #9263
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/NetPlayClient.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 75bb864a57..9d5992917a 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -746,8 +746,11 @@ void NetPlayClient::UpdateDevices() { for (PadMapping i = 0; i < 4; i++) { - // XXX: add support for other device types? does it matter? - SerialInterface::AddDevice(m_pad_map[i] > 0 ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i); + // Use local controller types for local controllers + if (m_pad_map[i] == m_local_player->pid) + SerialInterface::AddDevice(SConfig::GetInstance().m_SIDevice[i], i); + else + SerialInterface::AddDevice(m_pad_map[i] > 0 ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i); } } |