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

GCAdapter: Return input state by value

Browse Source
This commit is contained in:
Lioncash
2016-08-01 21:16:00 -04:00
parent 2be2b2a4f1
commit 041f4f5eea
6 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/HW/SI_DeviceGCAdapter.cpp
View File

@ -25,19 +25,18 @@ CSIDevice_GCAdapter::CSIDevice_GCAdapter(SIDevices device, int _iDeviceNumber)
GCPadStatus CSIDevice_GCAdapter::GetPadStatus()
{
GCPadStatus PadStatus;
memset(&PadStatus, 0, sizeof(PadStatus));
GCPadStatus pad_status = {};
// For netplay, the local controllers are polled in GetNetPads(), and
// the remote controllers receive their status there as well
if (!NetPlay::IsNetPlayRunning())
{
GCAdapter::Input(ISIDevice::m_iDeviceNumber, &PadStatus);
pad_status = GCAdapter::Input(m_iDeviceNumber);
}
HandleMoviePadStatus(&PadStatus);
HandleMoviePadStatus(&pad_status);
return PadStatus;
return pad_status;
}
int CSIDevice_GCAdapter::RunBuffer(u8* buffer, int length)

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

@ -973,7 +973,7 @@ bool NetPlayClient::GetNetPads(const u8 pad_nb, GCPadStatus* pad_status)
switch (SConfig::GetInstance().m_SIDevice[local_pad])
{
case SIDEVICE_WIIU_ADAPTER:
GCAdapter::Input(local_pad, pad_status);
*pad_status = GCAdapter::Input(local_pad);
break;
case SIDEVICE_GC_CONTROLLER:
default: