X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fjoystick.c;h=73150d5377f930a694394ac659eab15169b3ae37;hb=c4b26cf489dcc65a00bfcc05f7898700d2f0c9e4;hp=3e2b3abd698f5eb2ce50cc36926d9055cd12bb05;hpb=e5c5bf5c4a76a04f9bf64e92227bf2ef969fd25c;p=rocksndiamonds.git

diff --git a/src/joystick.c b/src/joystick.c
index 3e2b3abd..73150d53 100644
--- a/src/joystick.c
+++ b/src/joystick.c
@@ -74,6 +74,7 @@ int Joystick()
   } joy_ctrl;
 #endif
 
+  int joystick_nr = setup.input[0].joystick_nr;
   int js_x,js_y, js_b1,js_b2;
   int left, right, up, down;
   int result=0;
@@ -84,7 +85,7 @@ int Joystick()
 #ifndef MSDOS
   if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
   {
-    Error(ERR_RETURN, "cannot read joystick settings - no joystick support");
+    Error(ERR_WARN, "cannot read joystick settings - no joystick support");
     joystick_status = JOYSTICK_OFF;
     return(0);
   }
@@ -99,14 +100,14 @@ int Joystick()
   js_b2 = joy_ctrl.buttons & 2;
 #endif
 
-  left = JoystickPosition(joystick[setup.joystick_nr].xmiddle,
-			  joystick[setup.joystick_nr].xleft,  js_x);
-  right = JoystickPosition(joystick[setup.joystick_nr].xmiddle,
-			   joystick[setup.joystick_nr].xright, js_x);
-  up =    JoystickPosition(joystick[setup.joystick_nr].ymiddle,
-			   joystick[setup.joystick_nr].yupper, js_y);
-  down =  JoystickPosition(joystick[setup.joystick_nr].ymiddle,
-			   joystick[setup.joystick_nr].ylower, js_y);
+  left = JoystickPosition(joystick[joystick_nr].xmiddle,
+			  joystick[joystick_nr].xleft,  js_x);
+  right = JoystickPosition(joystick[joystick_nr].xmiddle,
+			   joystick[joystick_nr].xright, js_x);
+  up =    JoystickPosition(joystick[joystick_nr].ymiddle,
+			   joystick[joystick_nr].yupper, js_y);
+  down =  JoystickPosition(joystick[joystick_nr].ymiddle,
+			   joystick[joystick_nr].ylower, js_y);
 
   if (left>JOYSTICK_PERCENT)
     result |= JOY_LEFT;