X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=a5e0b22eba295bc28cd03645f49bcbaec44e293f;hb=4096fcbae692bfbf2f6506786659872a60b31693;hp=76a421bdbb5256974c432be1719fd4407a33dc8d;hpb=95566a9d19e926d3fc4868efda00b2cabe6955d6;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 76a421bd..a5e0b22e 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -68,8 +68,26 @@
 #define DEFAULT_KEY_LOAD_GAME	KSYM_F2
 #define DEFAULT_KEY_TOGGLE_PAUSE KSYM_space
 
+/* values for key_status */
+#define KEY_NOT_PRESSED		FALSE
+#define KEY_RELEASED		FALSE
+#define KEY_PRESSED		TRUE
 
-/* values for basic move directions (effective at runtime) */
+/* values for button status */
+#define MB_NOT_PRESSED		FALSE
+#define MB_NOT_RELEASED		TRUE
+#define MB_RELEASED		FALSE
+#define MB_PRESSED		TRUE
+#define MB_MENU_CHOICE		FALSE
+#define MB_MENU_MARK		TRUE
+#define MB_MENU_INITIALIZE	(-1)
+#define MB_MENU_LEAVE		(-2)
+#define MB_LEFTBUTTON		1
+#define MB_MIDDLEBUTTON		2
+#define MB_RIGHTBUTTON		3
+
+
+/* values for move directions */
 #define MV_BIT_LEFT		0
 #define MV_BIT_RIGHT		1
 #define MV_BIT_UP		2
@@ -77,19 +95,11 @@
 
 #define NUM_DIRECTIONS		4
 
-/* values for special "button" bitmasks (effective at runtime) */
+/* values for special "button" bitmasks */
 #define BUTTON_1		4
 #define BUTTON_2		5
 
-/* values for special move patterns (stored in level files) */
-#define MV_BIT_TOWARDS_PLAYER	6
-#define MV_BIT_AWAY_FROM_PLAYER	7
-#define MV_BIT_ALONG_LEFT_SIDE	8
-#define MV_BIT_ALONG_RIGHT_SIDE	9
-#define MV_BIT_TURNING_LEFT	10
-#define MV_BIT_TURNING_RIGHT	11
-
-/* values for move direction/pattern and special "button" key bitmasks */
+/* values for move direction and special "button" key bitmasks */
 #define MV_NO_MOVING		0
 #define MV_LEFT			(1 << MV_BIT_LEFT)
 #define MV_RIGHT		(1 << MV_BIT_RIGHT)
@@ -106,30 +116,6 @@
 				 (x) == MV_RIGHT ? MV_BIT_RIGHT :	\
 				 (x) == MV_UP    ? MV_BIT_UP    : MV_BIT_DOWN)
 
-#define MV_HORIZONTAL		(MV_LEFT | MV_RIGHT)
-#define MV_VERTICAL		(MV_UP | MV_DOWN)
-#define MV_ALL_DIRECTIONS	(MV_HORIZONTAL | MV_VERTICAL)
-#define MV_ANY_DIRECTION	(MV_ALL_DIRECTIONS)
-#define MV_TOWARDS_PLAYER	(1 << MV_BIT_TOWARDS_PLAYER)
-#define MV_AWAY_FROM_PLAYER	(1 << MV_BIT_AWAY_FROM_PLAYER)
-#define MV_ALONG_LEFT_SIDE	(1 << MV_BIT_ALONG_LEFT_SIDE)
-#define MV_ALONG_RIGHT_SIDE	(1 << MV_BIT_ALONG_RIGHT_SIDE)
-#define MV_TURNING_LEFT		(1 << MV_BIT_TURNING_LEFT)
-#define MV_TURNING_RIGHT	(1 << MV_BIT_TURNING_RIGHT)
-
-/* values for button status */
-#define MB_NOT_PRESSED		FALSE
-#define MB_NOT_RELEASED		TRUE
-#define MB_RELEASED		FALSE
-#define MB_PRESSED		TRUE
-#define MB_MENU_CHOICE		FALSE
-#define MB_MENU_MARK		TRUE
-#define MB_MENU_INITIALIZE	(-1)
-#define MB_MENU_LEAVE		(-2)
-#define MB_LEFTBUTTON		1
-#define MB_MIDDLEBUTTON		2
-#define MB_RIGHTBUTTON		3
-
 
 /* values for animation mode (frame order and direction) */
 #define ANIM_NONE		0
@@ -695,8 +681,8 @@ void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *,
 		     char *, char *, char *, int);
 
 void InitExitFunction(void (*exit_function)(int));
-void InitPlatformDependantStuff(void);
-void ClosePlatformDependantStuff(void);
+void InitPlatformDependentStuff(void);
+void ClosePlatformDependentStuff(void);
 
 void InitGfxFieldInfo(int, int, int, int, int, int, int, int, Bitmap *);
 void InitGfxDoor1Info(int, int, int, int);
@@ -754,6 +740,8 @@ inline void InitEventFilter(EventFilter);
 inline boolean PendingEvent(void);
 inline void NextEvent(Event *event);
 inline Key GetEventKey(KeyEvent *, boolean);
+inline KeyMod HandleKeyModState(Key, int);
+inline KeyMod GetKeyModState();
 inline boolean CheckCloseWindowEvent(ClientMessageEvent *);
 
 inline void InitJoysticks();