Merge from raven-branch. FEATURE_MULTIPLAYER has been disabled

temporarily until the netgame changes on raven-branch are finished.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2259

1 files changed, 4 insertions, 4 deletions

diff --git a/src/strife/m_menu.c b/src/strife/m_menu.c
index 92564e96..4d16e3e8 100644
--- a/src/strife/m_menu.c
+++ b/src/strife/m_menu.c
@@ -1679,23 +1679,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;