projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981025-1
[rocksndiamonds.git]
/
src
/
joystick.c
diff --git
a/src/joystick.c
b/src/joystick.c
index 8392a8a15daffab9868dd721b5d77592eee19625..27a190fc6b14fb48464cc62c64c417000f36d304 100644
(file)
--- a/
src/joystick.c
+++ b/
src/joystick.c
@@
-18,16
+18,6
@@
#include "joystick.h"
#include "misc.h"
#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;
void CheckJoystickData()
{
int i;
@@
-84,6
+74,7
@@
int Joystick()
} joy_ctrl;
#endif
} 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;
int js_x,js_y, js_b1,js_b2;
int left, right, up, down;
int result=0;