rnd-19981026-1

[rocksndiamonds.git] / src / joystick.c

diff --git a/src/joystick.c b/src/joystick.c
index 8392a8a15daffab9868dd721b5d77592eee19625..73150d5377f930a694394ac659eab15169b3ae37 100644 (file)
--- a/src/joystick.c
+++ b/src/joystick.c
@@ -18,16 +18,6 @@
 #include "joystick.h"
 #include "misc.h"
 
-/*
-#include "tools.h"
-#include "game.h"
-#include "events.h"
-#include "sound.h"
-#include "misc.h"
-#include "buttons.h"
-#include <math.h>
-*/
-
 void CheckJoystickData()
 {
   int i;
@@ -84,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;
@@ -94,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);
   }