projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved code for setting touch info for finger events to separate function
[rocksndiamonds.git]
/
src
/
libgame
/
joystick.c
diff --git
a/src/libgame/joystick.c
b/src/libgame/joystick.c
index 8e8f61e12c57411ada5ad29a75318729eea9d39d..4a1bc7d5074fcdcbdd0df41599eb72544802cc3e 100644
(file)
--- a/
src/libgame/joystick.c
+++ b/
src/libgame/joystick.c
@@
-4,7
+4,7
@@
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
-// http://www.artsoft.org/
+// http
s
://www.artsoft.org/
// ----------------------------------------------------------------------------
// joystick.c
// ============================================================================
// ----------------------------------------------------------------------------
// joystick.c
// ============================================================================
@@
-211,10
+211,11
@@
int JoystickExt(int player_nr, boolean use_as_joystick_nr)
if (!ReadJoystick(joystick_nr, &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);
+
Warn(
"cannot read joystick device '%s'",
+ setup.input[player_nr].joy.device_name);
joystick.status = JOYSTICK_NOT_AVAILABLE;
joystick.status = JOYSTICK_NOT_AVAILABLE;
+
return JOY_NO_ACTION;
}
return JOY_NO_ACTION;
}