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

diff --git a/src/joystick.c b/src/joystick.c
index 8392a8a1..3e2b3abd 100644
--- 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;
@@ -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;