rocksndiamonds-1.2.0

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index 8d1de10daab05453a25e881a39f478064d1b3681..2d8eca3e861657b6442169036ac88d5395f08934 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -622,12 +622,19 @@ static int HandleJoystickForAllPlayers()
   {
     byte joy_action = 0;
 
+    /*
     if (!setup.input[i].use_joystick)
       continue;
+      */
 
     joy_action = Joystick(i);
     result |= joy_action;
 
+
+    if (!setup.input[i].use_joystick)
+      continue;
+
+
     stored_player[i].action = joy_action;
   }
 
@@ -655,7 +662,7 @@ void HandleJoystick()
     case SETUP:
     case SETUPINPUT:
     {
-      static long joystickmove_delay = 0;
+      static unsigned long joystickmove_delay = 0;
 
       if (joystick && !button && !DelayReached(&joystickmove_delay, 150))
        newbutton = dx = dy = 0;