X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fjoystick.c;h=27a190fc6b14fb48464cc62c64c417000f36d304;hb=1146572677fd6858df5fc1fabfd7f7294bdefed7;hp=0e1a42cd969b056933bd5589f6cc3e403fe4bc07;hpb=823bddb0d9cc63ddda17a2cd20266aa3b82bde38;p=rocksndiamonds.git

diff --git a/src/joystick.c b/src/joystick.c
index 0e1a42cd..27a190fc 100644
--- a/src/joystick.c
+++ b/src/joystick.c
@@ -16,16 +16,7 @@
 #endif
 
 #include "joystick.h"
-
-/*
-#include "tools.h"
-#include "game.h"
-#include "events.h"
-#include "sound.h"
 #include "misc.h"
-#include "buttons.h"
-#include <math.h>
-*/
 
 void CheckJoystickData()
 {
@@ -83,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;
@@ -93,8 +85,7 @@ int Joystick()
 #ifndef MSDOS
   if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
   {
-    fprintf(stderr,"%s: cannot read joystick settings - no joystick support\n",
-	    progname);
+    Error(ERR_RETURN, "cannot read joystick settings - no joystick support");
     joystick_status = JOYSTICK_OFF;
     return(0);
   }