X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fjoystick.h;h=d778c88c178cc9abaaa22fbc307e4481735184e0;hb=a7c06161253796a30a0237a7f5a044f459c8cf35;hp=37f02a90179bba4e179e35c0e06b6918dd7feaa3;hpb=4e3bc17b6150a17a76cba2da2daa96af65bde5b9;p=rocksndiamonds.git

diff --git a/src/libgame/joystick.h b/src/libgame/joystick.h
index 37f02a90..d778c88c 100644
--- 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                            *
@@ -36,7 +36,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,10 +59,13 @@
 #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