aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx/Ui/GLScreen.cs
diff options
context:
space:
mode:
authoremmauss <emmausssss@gmail.com>2019-08-05 21:58:27 +0300
committerAc_K <Acoustik666@gmail.com>2019-08-05 20:58:27 +0200
commit1ba58e9942e54175e3f3a0e1d57a48537f4888b1 (patch)
treecc33a49301aeea1e2729cbffe823f08a949223bb /Ryujinx/Ui/GLScreen.cs
parent54b79dffa8eafe9da9765329930e8832ae90ae83 (diff)
Use the Joystick interface for game controller input. (#737)
* switch gamepad input to joystick * fix style nits * modify config.md to reflect new changes
Diffstat (limited to 'Ryujinx/Ui/GLScreen.cs')
-rw-r--r--Ryujinx/Ui/GLScreen.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Ryujinx/Ui/GLScreen.cs b/Ryujinx/Ui/GLScreen.cs
index 33ecc917..a881959c 100644
--- a/Ryujinx/Ui/GLScreen.cs
+++ b/Ryujinx/Ui/GLScreen.cs
@@ -183,17 +183,17 @@ namespace Ryujinx
};
}
- currentButton |= Configuration.Instance.GamepadControls.GetButtons();
+ currentButton |= Configuration.Instance.JoystickControls.GetButtons();
// Keyboard has priority stick-wise
if (leftJoystickDx == 0 && leftJoystickDy == 0)
{
- (leftJoystickDx, leftJoystickDy) = Configuration.Instance.GamepadControls.GetLeftStick();
+ (leftJoystickDx, leftJoystickDy) = Configuration.Instance.JoystickControls.GetLeftStick();
}
if (rightJoystickDx == 0 && rightJoystickDy == 0)
{
- (rightJoystickDx, rightJoystickDy) = Configuration.Instance.GamepadControls.GetRightStick();
+ (rightJoystickDx, rightJoystickDy) = Configuration.Instance.JoystickControls.GetRightStick();
}
leftJoystick = new JoystickPosition