commit 5130b54658ab03f3fc18727615b529d6e241566c
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Wed Jan 12 23:22:20 2011 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Wed Jan 12 23:22:20 2011 +0000
Fix menu navigation when using joystick / joypad (thanks AlexXav).
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2237
---
NEWS | 5 +++++
src/m_menu.c | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/NEWS b/NEWS
index 723c68e9..c5a4cfaa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+1.6.0 (2011-??-??):
+
+ Bugs fixed:
+ * Menu navigation when using joystick/joypad (thanks AlexXav).
+
1.5.0 (2011-01-02):
Big changes in this version:
diff --git a/src/m_menu.c b/src/m_menu.c
index 7b1c5a6e..efc4fefe 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1450,23 +1450,23 @@ boolean M_Responder (event_t* ev)
if (ev->type == ev_joystick && joywait < I_GetTime())
{
- if (ev->data3 == -1)
+ if (ev->data3 < 0)
{
key = key_menu_up;
joywait = I_GetTime() + 5;
}
- else if (ev->data3 == 1)
+ else if (ev->data3 > 0)
{
key = key_menu_down;
joywait = I_GetTime() + 5;
}
- if (ev->data2 == -1)
+ if (ev->data2 < 0)
{
key = key_menu_left;
joywait = I_GetTime() + 2;
}
- else if (ev->data2 == 1)
+ else if (ev->data2 > 0)
{
key = key_menu_right;
joywait = I_GetTime() + 2;