X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fjoystick.c;h=e9e520bd3245f11d691a38168763f081de4dfab4;hb=8cef2a63b6c56ba086183693d3f73f02862cbd8f;hp=8392a8a15daffab9868dd721b5d77592eee19625;hpb=29014045f4de045f8452fdf7ab32622c94b37eef;p=rocksndiamonds.git diff --git a/src/joystick.c b/src/joystick.c index 8392a8a1..e9e520bd 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 -*/ - void CheckJoystickData() { int i; @@ -84,6 +74,7 @@ int Joystick() } joy_ctrl; #endif + int joystick_nr = setup.joy_input[0].joystick_nr; int js_x,js_y, js_b1,js_b2; int left, right, up, down; int result=0;