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

diff --git a/src/libgame/joystick.h b/src/libgame/joystick.h
index a826efff..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
@@ -84,7 +86,7 @@ int JoystickButton(int);
 int AnyJoystick(void);
 int AnyJoystickButton(void);
 
-void DeactivateJoystickForCalibration();
-void ActivateJoystickIfAvailable();
+void DeactivateJoystick();
+void ActivateJoystick();
 
 #endif	/* JOYSTICK_H */