projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed output to logfile for "autofix" command
[rocksndiamonds.git]
/
src
/
libgame
/
joystick.h
diff --git
a/src/libgame/joystick.h
b/src/libgame/joystick.h
index 74dbad76c1b44a4bab313cd0c5387ceb0ce79b71..e43844edd8b8e63b8d9a10752205162e463b8cd5 100644
(file)
--- a/
src/libgame/joystick.h
+++ b/
src/libgame/joystick.h
@@
-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.h
// ============================================================================
// ----------------------------------------------------------------------------
// joystick.h
// ============================================================================
@@
-21,6
+21,8
@@
#define JOYSTICK_NOT_CONFIGURED (1 << 3)
#define JOYSTICK_ACTIVATED (JOYSTICK_AVAILABLE | JOYSTICK_ACTIVE)
#define JOYSTICK_NOT_CONFIGURED (1 << 3)
#define JOYSTICK_ACTIVATED (JOYSTICK_AVAILABLE | JOYSTICK_ACTIVE)
+#define MAX_JOYSTICK_NAME_LEN 40
+
#if defined(PLATFORM_FREEBSD)
#define DEV_JOYSTICK_0 "/dev/joy0"
#define DEV_JOYSTICK_1 "/dev/joy1"
#if defined(PLATFORM_FREEBSD)
#define DEV_JOYSTICK_0 "/dev/joy0"
#define DEV_JOYSTICK_1 "/dev/joy1"
@@
-33,8
+35,8
@@
#define DEV_JOYSTICK_3 "/dev/js3"
#endif
#define DEV_JOYSTICK_3 "/dev/js3"
#endif
-/
* get these values from the program 'js' from the joystick package, */
-/
* set JOYSTICK_PERCENT to a threshold appropriate for your joystick */
+/
/ get these values from the program 'js' from the joystick package,
+/
/ set JOYSTICK_PERCENT to a threshold appropriate for your joystick
#define JOYSTICK_MAX_AXIS_POS 32767
#define JOYSTICK_MAX_AXIS_POS 32767
@@
-69,6
+71,7
@@
char *getJoyNameFromJoySymbol(int);
int getJoySymbolFromJoyName(char *);
int getJoystickNrFromDeviceName(char *);
char *getDeviceNameFromJoystickNr(int);
int getJoySymbolFromJoyName(char *);
int getJoystickNrFromDeviceName(char *);
char *getDeviceNameFromJoystickNr(int);
+char *getFormattedJoystickName(const char *);
void CheckJoystickData(void);
int Joystick(int);
void CheckJoystickData(void);
int Joystick(int);
@@
-77,7
+80,7
@@
int JoystickButton(int);
int AnyJoystick(void);
int AnyJoystickButton(void);
int AnyJoystick(void);
int AnyJoystickButton(void);
-void DeactivateJoystick();
-void ActivateJoystick();
+void DeactivateJoystick(
void
);
+void ActivateJoystick(
void
);
-#endif /
* JOYSTICK_H */
+#endif /
/ JOYSTICK_H