X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fjoystick.h;h=a48c2bb39f2d54d212fc4bb25f41aab51ad54249;hp=64a8166d5cc95115802130b5f8a6edaa0da03f32;hb=3ae3dff29ac1a6022b1e5af414ba2c99391148c8;hpb=b7d31643c9c84104fb3ebef778e545928610ff65

diff --git a/src/joystick.h b/src/joystick.h
index 64a8166d..a48c2bb3 100644
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -1,12 +1,12 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1997 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33604 Bielefeld                                   *
-*        Telefon: (0521) 290471                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  joystick.h                                              *
 ***********************************************************/
@@ -23,27 +23,34 @@
 #include <machine/joystick.h>
 #define DEV_JOYSTICK_0		"/dev/joy0"
 #define DEV_JOYSTICK_1		"/dev/joy1"
+#define DEV_JOYSTICK_2		"/dev/joy2"
+#define DEV_JOYSTICK_3		"/dev/joy3"
 #else
 #define DEV_JOYSTICK_0		"/dev/js0"
 #define DEV_JOYSTICK_1		"/dev/js1"
+#define DEV_JOYSTICK_2		"/dev/js2"
+#define DEV_JOYSTICK_3		"/dev/js3"
 #endif
 
 /* get these values from the program 'js' from the joystick package, */
 /* set JOYSTICK_PERCENT to a threshold appropriate for your joystick */
 #define JOYSTICK_XLEFT		30
-#define JOYSTICK_XRIGHT		1250
 #define JOYSTICK_XMIDDLE	530
+#define JOYSTICK_XRIGHT		1250
 #define JOYSTICK_YUPPER		40
-#define JOYSTICK_YLOWER		1440
 #define JOYSTICK_YMIDDLE	680
+#define JOYSTICK_YLOWER		1440
+
 #define JOYSTICK_PERCENT	25
+
 #define JOY_LEFT		MV_LEFT
 #define JOY_RIGHT		MV_RIGHT
 #define JOY_UP			MV_UP
 #define JOY_DOWN	       	MV_DOWN
-#define JOY_BUTTON_1		16
-#define JOY_BUTTON_2		32
+#define JOY_BUTTON_1		(1<<4)
+#define JOY_BUTTON_2		(1<<5)
 #define JOY_BUTTON		(JOY_BUTTON_1 | JOY_BUTTON_2)
+
 #define JOY_BUTTON_NOT_PRESSED	0
 #define JOY_BUTTON_PRESSED	1
 #define JOY_BUTTON_NEW_PRESSED	2
@@ -57,8 +64,9 @@
 
 
 void CheckJoystickData(void);
-int JoystickPosition(int, int, int);
-int Joystick(void);
-int JoystickButton(void);
+int Joystick(int);
+int JoystickButton(int);
+int AnyJoystick(void);
+int AnyJoystickButton(void);
 
 #endif