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

Fixup typo in GCAdapter

This commit is contained in:
Ryan Houdek 2016-01-06 00:35:56 -06:00
parent 1dcc199a63
commit af6a5ddafe
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/InputCommon/GCAdapter.cpp
View File

@ -356,11 +356,7 @@ void Reset()
void Input(int chan, GCPadStatus* pad) void Input(int chan, GCPadStatus* pad)
{ {
bool use_adapter = SConfig::GetInstance().m_SIDevice[0] == SIDEVICE_WIIU_ADAPTER || if (!UseAdapter())
SConfig::GetInstance().m_SIDevice[1] == SIDEVICE_WIIU_ADAPTER ||
SConfig::GetInstance().m_SIDevice[2] == SIDEVICE_WIIU_ADAPTER ||
SConfig::GetInstance().m_SIDevice[3] == SIDEVICE_WIIU_ADAPTER;
if (!use_adapter)
return; return;
if (s_handle == nullptr || !s_detected) if (s_handle == nullptr || !s_detected)
@ -459,7 +455,7 @@ void ResetRumble()
void Output(int chan, u8 rumble_command) void Output(int chan, u8 rumble_command)
{ {
if (s_handle == nullptr || !UseAdapter() || !SConfig::GetInstance().m_AdapterRumble) if (s_handle == nullptr || !UseAdapter() || !SConfig::GetInstance().m_AdapterRumble[chan])
return; return;
// Skip over rumble commands if it has not changed or the controller is wireless // Skip over rumble commands if it has not changed or the controller is wireless