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

Cleaned up NetPlay a bit, fixed some UI text.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6425 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2010-11-16 01:55:29 +00:00
parent d0e8d8a509
commit 71f842e8c0
10 changed files with 88 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
View File

@ -133,22 +133,15 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low)
Pad::GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus);
u32 netValues[2] = {0};
int NetPlay = 2;
#if defined(HAVE_WX) && HAVE_WX
NetPlay = NetPlay_GetInput(ISIDevice::m_iDeviceNumber, PadStatus, netValues);
#endif
if (NetPlay != 2)
u32 netValues[2];
if (NetPlay_GetInput(ISIDevice::m_iDeviceNumber, PadStatus, netValues))
{
if (NetPlay == 1)
{
_Hi = netValues[0]; // first 4 bytes
_Low = netValues[1]; // last 4 bytes
}
_Hi = netValues[0]; // first 4 bytes
_Low = netValues[1]; // last 4 bytes
return true;
}
#endif
Frame::SetPolledDevice();

2
Source/Core/Core/Src/HW/SI_DeviceGCController.h
View File

@ -103,7 +103,7 @@ public:
virtual int RunBuffer(u8* _pBuffer, int _iLength);
// Send and Receive pad input from network
static int NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus);
static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus);
static u8 NetPlay_GetPadNum(u8 numPAD);
// Return true on new data