From 5e709f3d72b5e7d1374322946cd2fde3ace26d8d Mon Sep 17 00:00:00 2001 From: mathieui Date: Sat, 23 Jan 2016 17:29:07 +0100 Subject: [PATCH] [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 --- Source/Core/Core/NetPlayClient.cpp | 7 +++++-- 1 file 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); } }