From 03e01872b0f6c3974133dc15938d090070298e74 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Wed, 26 May 2010 21:13:43 +0000 Subject: [PATCH] Unbreak nowx build. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5500 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/HW/SI_DeviceGCController.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp index a0df5813d0..b1036d9a8d 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp @@ -133,9 +133,9 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low) u32 netValues[2] = {0}; int NetPlay = 2; - #if defined(HAVE_WX) && HAVE_WX +#if defined(HAVE_WX) && HAVE_WX NetPlay = NetPlay_GetInput(ISIDevice::m_iDeviceNumber, PadStatus, netValues); - #endif +#endif if (NetPlay != 2) { @@ -272,8 +272,12 @@ void CSIDevice_GCController::SendCommand(u32 _Cmd, u8 _Poll) unsigned int uType = command.Parameter1; // 0 = stop, 1 = rumble, 2 = stop hard unsigned int uStrength = command.Parameter2; +#if defined(HAVE_WX) && HAVE_WX // get the correct pad number that should rumble locally when using netplay const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); +#else + const u8 numPAD = 0; +#endif if (numPAD < 4) if (pad->PAD_Rumble)