rnd-20061230-1-src

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

diff --git a/src/libgame/joystick.h b/src/libgame/joystick.h
index cf048f11b99d069d58683a028d61b02297954c39..efaaf5b8974440571dc1d6cc97e071c3f42158f4 100644 (file)
--- a/src/libgame/joystick.h
+++ b/src/libgame/joystick.h
@@ -1,7 +1,7 @@
 /***********************************************************
 * Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
+* (c) 1995-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -59,9 +59,11 @@
 #define JOY_RIGHT              MV_RIGHT
 #define JOY_UP                 MV_UP
 #define JOY_DOWN               MV_DOWN
-#define JOY_BUTTON_1           (1 << 4)
-#define JOY_BUTTON_2           (1 << 5)
-#define JOY_BUTTON             (JOY_BUTTON_1 | JOY_BUTTON_2)
+#define JOY_BUTTON_1           KEY_BUTTON_1
+#define JOY_BUTTON_2           KEY_BUTTON_2
+#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