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

SI_DeviceGCAdapter: Amend variable naming

This commit is contained in:
Lioncash 2017-03-14 17:47:56 -04:00
parent e68e99ef71
commit 89f5b3b5d9
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp
View File

@ -15,13 +15,13 @@
#include "Core/NetPlayProto.h" #include "Core/NetPlayProto.h"
#include "InputCommon/GCAdapter.h" #include "InputCommon/GCAdapter.h"
CSIDevice_GCAdapter::CSIDevice_GCAdapter(SIDevices device, int _iDeviceNumber) CSIDevice_GCAdapter::CSIDevice_GCAdapter(SIDevices device, int device_number)
: CSIDevice_GCController(device, _iDeviceNumber) : CSIDevice_GCController(device, device_number)
{ {
// get the correct pad number that should rumble locally when using netplay // get the correct pad number that should rumble locally when using netplay
const int numPAD = NetPlay_InGamePadToLocalPad(m_device_number); const int pad_num = NetPlay_InGamePadToLocalPad(m_device_number);
if (numPAD < 4) if (pad_num < 4)
m_simulate_konga = SConfig::GetInstance().m_AdapterKonga[numPAD]; m_simulate_konga = SConfig::GetInstance().m_AdapterKonga[pad_num];
} }
GCPadStatus CSIDevice_GCAdapter::GetPadStatus() GCPadStatus CSIDevice_GCAdapter::GetPadStatus()
@ -60,11 +60,11 @@ int CSIDevice_GCAdapter::RunBuffer(u8* buffer, int length)
return CSIDevice_GCController::RunBuffer(buffer, length); return CSIDevice_GCController::RunBuffer(buffer, length);
} }
void CSIDevice_GCController::Rumble(int numPad, ControlState strength) void CSIDevice_GCController::Rumble(int pad_num, ControlState strength)
{ {
SIDevices device = SConfig::GetInstance().m_SIDevice[numPad]; SIDevices device = SConfig::GetInstance().m_SIDevice[pad_num];
if (device == SIDEVICE_WIIU_ADAPTER) if (device == SIDEVICE_WIIU_ADAPTER)
GCAdapter::Output(numPad, static_cast<u8>(strength)); GCAdapter::Output(pad_num, static_cast<u8>(strength));
else if (SIDevice_IsGCController(device)) else if (SIDevice_IsGCController(device))
Pad::Rumble(numPad, strength); Pad::Rumble(pad_num, strength);
} }

2
Source/Core/Core/HW/SI/SI_DeviceGCAdapter.h
View File

@ -11,7 +11,7 @@
class CSIDevice_GCAdapter : public CSIDevice_GCController class CSIDevice_GCAdapter : public CSIDevice_GCController
{ {
public: public:
CSIDevice_GCAdapter(SIDevices device, int _iDeviceNumber); CSIDevice_GCAdapter(SIDevices device, int device_number);
GCPadStatus GetPadStatus() override; GCPadStatus GetPadStatus() override;
int RunBuffer(u8* buffer, int length) override; int RunBuffer(u8* buffer, int length) override;