improved virtual buttons for touch devices (Android)

[rocksndiamonds.git] / src / libgame / joystick.h

diff --git a/src/libgame/joystick.h b/src/libgame/joystick.h
index 37f02a90179bba4e179e35c0e06b6918dd7feaa3..c7f65febe498c88f1c052b11abb82c5861a195f7 100644 (file)
--- a/src/libgame/joystick.h
+++ b/src/libgame/joystick.h
@@ -1,15 +1,13 @@
-/***********************************************************
-* Artsoft Retro-Game Library                               *
-*----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* joystick.h                                               *
-***********************************************************/
+// ============================================================================
+// Artsoft Retro-Game Library
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//                         Holger Schemel
+//                 info@artsoft.org
+//                 http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// joystick.h
+// ============================================================================
 
 #ifndef JOYSTICK_H
 #define JOYSTICK_H
@@ -36,7 +34,7 @@
 /* get these values from the program 'js' from the joystick package, */
 /* set JOYSTICK_PERCENT to a threshold appropriate for your joystick */
 
-#ifdef TARGET_SDL
+#if defined(TARGET_SDL)
 #define JOYSTICK_XLEFT         -32767
 #define JOYSTICK_XMIDDLE       0
 #define JOYSTICK_XRIGHT                32767
@@ -59,21 +57,19 @@
 #define JOY_RIGHT              MV_RIGHT
 #define JOY_UP                 MV_UP
 #define JOY_DOWN               MV_DOWN
-#define JOY_BUTTON_1           MV_BUTTON_1
-#define JOY_BUTTON_2           MV_BUTTON_2
-#define JOY_MOTION             MV_MOTION
-#define JOY_BUTTON             MV_BUTTON
+#define JOY_BUTTON_1           KEY_BUTTON_1
+#define JOY_BUTTON_2           KEY_BUTTON_2
+#define JOY_BUTTON_SNAP                KEY_BUTTON_SNAP
+#define JOY_BUTTON_DROP                KEY_BUTTON_DROP
+#define JOY_MOTION             KEY_MOTION
+#define JOY_BUTTON             KEY_BUTTON
+#define JOY_ACTION             KEY_ACTION
 
 #define JOY_BUTTON_NOT_PRESSED 0
 #define JOY_BUTTON_PRESSED     1
 #define JOY_BUTTON_NEW_PRESSED 2
 #define JOY_BUTTON_NEW_RELEASED        3
 
-#if defined(PLATFORM_UNIX)
-void UnixInitJoysticks(void);
-boolean UnixReadJoystick(int, int *, int *, boolean *, boolean *);
-#endif
-
 char *getJoyNameFromJoySymbol(int);
 int getJoySymbolFromJoyName(char *);
 int getJoystickNrFromDeviceName(char *);