From 89f5b3b5d963ab414731e387fd9f9c5dce5d9e0e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 14 Mar 2017 17:47:56 -0400 Subject: [PATCH] SI_DeviceGCAdapter: Amend variable naming --- Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp | 18 +++++++++--------- Source/Core/Core/HW/SI/SI_DeviceGCAdapter.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp b/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp index e4ec446d7d..68ccee83f0 100644 --- a/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp +++ b/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp @@ -15,13 +15,13 @@ #include "Core/NetPlayProto.h" #include "InputCommon/GCAdapter.h" -CSIDevice_GCAdapter::CSIDevice_GCAdapter(SIDevices device, int _iDeviceNumber) - : CSIDevice_GCController(device, _iDeviceNumber) +CSIDevice_GCAdapter::CSIDevice_GCAdapter(SIDevices device, int device_number) + : CSIDevice_GCController(device, device_number) { // get the correct pad number that should rumble locally when using netplay - const int numPAD = NetPlay_InGamePadToLocalPad(m_device_number); - if (numPAD < 4) - m_simulate_konga = SConfig::GetInstance().m_AdapterKonga[numPAD]; + const int pad_num = NetPlay_InGamePadToLocalPad(m_device_number); + if (pad_num < 4) + m_simulate_konga = SConfig::GetInstance().m_AdapterKonga[pad_num]; } GCPadStatus CSIDevice_GCAdapter::GetPadStatus() @@ -60,11 +60,11 @@ int CSIDevice_GCAdapter::RunBuffer(u8* buffer, int 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) - GCAdapter::Output(numPad, static_cast(strength)); + GCAdapter::Output(pad_num, static_cast(strength)); else if (SIDevice_IsGCController(device)) - Pad::Rumble(numPad, strength); + Pad::Rumble(pad_num, strength); } diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.h b/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.h index 6e12b2c874..451a4ff1b3 100644 --- a/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.h +++ b/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.h @@ -11,7 +11,7 @@ class CSIDevice_GCAdapter : public CSIDevice_GCController { public: - CSIDevice_GCAdapter(SIDevices device, int _iDeviceNumber); + CSIDevice_GCAdapter(SIDevices device, int device_number); GCPadStatus GetPadStatus() override; int RunBuffer(u8* buffer, int length) override;