rnd-19981017-1

[rocksndiamonds.git] / src / joystick.c

diff --git a/src/joystick.c b/src/joystick.c
index 0e1a42cd969b056933bd5589f6cc3e403fe4bc07..3e2b3abd698f5eb2ce50cc36926d9055cd12bb05 100644 (file)
--- 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()
 {
@@ -93,8 +84,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);
   }
@@ -109,14 +99,14 @@ int Joystick()
   js_b2 = joy_ctrl.buttons & 2;
 #endif
 
-  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);
+  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);
 
   if (left>JOYSTICK_PERCENT)
     result |= JOY_LEFT;