X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fjoystick.h;h=d571a1303fb296aafed0c35ab0eda3e949814cec;hb=c431e727cdc0ecec3468ab4b89cae2e9708aa49a;hp=cf048f11b99d069d58683a028d61b02297954c39;hpb=909a0a4d74f274b5c05c16cf595b235aa092fc9a;p=rocksndiamonds.git

diff --git a/src/libgame/joystick.h b/src/libgame/joystick.h
index cf048f11..d571a130 100644
--- a/src/libgame/joystick.h
+++ b/src/libgame/joystick.h
@@ -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