rnd-20020418-1-src

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

diff --git a/src/libgame/joystick.h b/src/libgame/joystick.h
index a826efff8213b4bad23fd16568fcd5fbff29d39f..37f02a90179bba4e179e35c0e06b6918dd7feaa3 100644 (file)
--- a/src/libgame/joystick.h
+++ b/src/libgame/joystick.h
@@ -59,9 +59,10 @@
 #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           MV_BUTTON_1
+#define JOY_BUTTON_2           MV_BUTTON_2
+#define JOY_MOTION             MV_MOTION
+#define JOY_BUTTON             MV_BUTTON
 
 #define JOY_BUTTON_NOT_PRESSED 0
 #define JOY_BUTTON_PRESSED     1
@@ -84,7 +85,7 @@ int JoystickButton(int);
 int AnyJoystick(void);
 int AnyJoystickButton(void);
 
-void DeactivateJoystickForCalibration();
-void ActivateJoystickIfAvailable();
+void DeactivateJoystick();
+void ActivateJoystick();
 
 #endif /* JOYSTICK_H */