projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added comment
[rocksndiamonds.git]
/
src
/
libgame
/
joystick.c
diff --git
a/src/libgame/joystick.c
b/src/libgame/joystick.c
index a6a065cddc318a4322279fb8dd20b85d3328b973..61d0a113970302c70e1337d20096cab32b5102b9 100644
(file)
--- a/
src/libgame/joystick.c
+++ b/
src/libgame/joystick.c
@@
-161,22
+161,22
@@
void CheckJoystickData()
int JoystickExt(int player_nr, boolean use_as_joystick_nr)
{
int JoystickExt(int player_nr, boolean use_as_joystick_nr)
{
- int joystick_
fd = joystick.fd
[player_nr];
+ int joystick_
nr = joystick.nr
[player_nr];
int js_x, js_y;
boolean js_b1, js_b2;
int left, right, up, down;
int result = JOY_NO_ACTION;
if (use_as_joystick_nr)
int js_x, js_y;
boolean js_b1, js_b2;
int left, right, up, down;
int result = JOY_NO_ACTION;
if (use_as_joystick_nr)
- joystick_
fd
= player_nr;
+ joystick_
nr
= player_nr;
if (joystick.status != JOYSTICK_ACTIVATED)
return JOY_NO_ACTION;
if (joystick.status != JOYSTICK_ACTIVATED)
return JOY_NO_ACTION;
- if (joystick_
fd
< 0)
+ if (joystick_
nr
< 0)
return JOY_NO_ACTION;
return JOY_NO_ACTION;
- if (!ReadJoystick(joystick_
fd
, &js_x, &js_y, &js_b1, &js_b2))
+ if (!ReadJoystick(joystick_
nr
, &js_x, &js_y, &js_b1, &js_b2))
{
Error(ERR_WARN, "cannot read joystick device '%s'",
setup.input[player_nr].joy.device_name);
{
Error(ERR_WARN, "cannot read joystick device '%s'",
setup.input[player_nr].joy.device_name);