ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3554 from mathieui/netplay_devices 

[netplay] Use the local type of each SI device
This commit is contained in:
Ryan Houdek 2016-01-23 16:03:25 -05:00
parent 1c3c36f285 5e709f3d72
commit 6e13496d8d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/NetPlayClient.cpp
View File

@ -746,8 +746,11 @@ void NetPlayClient::UpdateDevices()
{ {
for (PadMapping i = 0; i < 4; i++) for (PadMapping i = 0; i < 4; i++)
{ {
// XXX: add support for other device types? does it matter? // Use local controller types for local controllers
SerialInterface::AddDevice(m_pad_map[i] > 0 ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i); 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);
} }
} }