commit 81b81c96bf481bfa0cb829db38144eef14e0d048
Author: Wintermute 0110 <wintermute0110@gmail.com>
AuthorDate: Tue Mar 21 04:05:31 2017 +0900
Commit: Simon Howard <fraggle+github@gmail.com>
CommitDate: Mon Mar 20 20:05:31 2017 +0100
Fix detection of triggers in XBox 360 wireless gamepad. (#889)
Bad axis detection was apparently broken at some point; this fixes it.
---
.gitignore | 6 ++++++
src/setup/txt_joyaxis.c | 10 +++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index c9599ffc..b1d290c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,9 @@ STRIFE*.png
.#*
.*.swp
.DS_store
+
+# Ignore GNU Global tags and html files
+GPATH
+GRTAGS
+GTAGS
+/HTML/
diff --git a/src/setup/txt_joyaxis.c b/src/setup/txt_joyaxis.c
index 3e2119d4..498e5294 100644
--- a/src/setup/txt_joyaxis.c
+++ b/src/setup/txt_joyaxis.c
@@ -150,13 +150,13 @@ static boolean CalibrateAxis(txt_joystick_axis_t *joystick_axis)
for (i = 0; i < SDL_JoystickNumAxes(joystick_axis->joystick); ++i)
{
- //if (bad_axis[i])
- //{
- // continue;
- //}
-
axis_value = SDL_JoystickGetAxis(joystick_axis->joystick, i);
+ if (joystick_axis->bad_axis[i])
+ {
+ continue;
+ }
+
if (abs(axis_value) > best_value)
{
best_value = abs(axis_value);