Merge pull request #652 from booto/controller_stick_wrap_fix

GCPadEmu: stop sticks wrapping at extreme values
dolphin-emu · Jul 19, 2014 · 56e9efc · 56e9efc
2 parents 2c8393c + 631a361
commit 56e9efc
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Source/Core/Core/HW/GCPadEmu.cpp b/Source/Core/Core/HW/GCPadEmu.cpp
@@ -103,12 +103,12 @@ void GCPad::GetInput(GCPadStatus* const pad)
 
 	// sticks
 	m_main_stick->GetState(&x, &y);
-	pad->stickX = 0x7F + (x * 0x80);
-	pad->stickY = 0x7F + (y * 0x80);
+	pad->stickX = 0x80 + (x * 0x7F);
+	pad->stickY = 0x80 + (y * 0x7F);
 
 	m_c_stick->GetState(&x, &y);
-	pad->substickX = 0x7F + (x * 0x80);
-	pad->substickY = 0x7F + (y * 0x80);
+	pad->substickX = 0x80 + (x * 0x7F);
+	pad->substickY = 0x80 + (y * 0x7F);
 
 	// triggers
 	m_triggers->GetState(&pad->button, trigger_bitmasks, triggers);