mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 21:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3569 from mathieui/netplay-gcpad-position

Browse source 
[netplay] Fix a regression
This commit is contained in:
Pierre Bourdon 2016-01-30 11:54:31 +01:00
commit 9da8593cf4
3 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/Core/Core/HW/SI_DeviceGCAdapter.cpp
View file

@ -16,7 +16,8 @@ CSIDevice_GCAdapter::CSIDevice_GCAdapter(SIDevices device, int _iDeviceNumber)
{
// get the correct pad number that should rumble locally when using netplay
const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber);
m_simulate_konga = SConfig::GetInstance().m_AdapterKonga[numPAD];
if (numPAD < 4)
m_simulate_konga = SConfig::GetInstance().m_AdapterKonga[numPAD];
}
GCPadStatus CSIDevice_GCAdapter::GetPadStatus()
@ -39,12 +40,14 @@ int CSIDevice_GCAdapter::RunBuffer(u8* _pBuffer, int _iLength)
// Read the command
EBufferCommands command = static_cast<EBufferCommands>(_pBuffer[3]);
// get the correct pad number that should rumble locally when using netplay
const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber);
if (!GCAdapter::DeviceConnected(numPAD))
if (numPAD < 4)
{
reinterpret_cast<u32*>(_pBuffer)[0] = SI_NONE;
return 4;
if (!GCAdapter::DeviceConnected(numPAD))
{
reinterpret_cast<u32*>(_pBuffer)[0] = SI_NONE;
return 4;
}
}
// Handle it