rnd-20020921-8-src

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

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 497a39585cd8091f30ac48d491cec08371072c21..463d76fcc0b12fbdb23037661757d2ef8c054a6b 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -67,17 +67,27 @@
 #define DEFAULT_KEY_TOGGLE_PAUSE KSYM_space
 
 /* values for move directions and special "button" keys */
+#define MV_BIT_LEFT            0
+#define MV_BIT_RIGHT           1
+#define MV_BIT_UP              2
+#define MV_BIT_DOWN            3
+#define NUM_MV_DIRECTIONS      4
+
 #define MV_NO_MOVING           0
-#define MV_LEFT                        (1 << 0)
-#define MV_RIGHT               (1 << 1)
-#define MV_UP                  (1 << 2)
-#define MV_DOWN                        (1 << 3)
+#define MV_LEFT                        (1 << MV_BIT_LEFT)
+#define MV_RIGHT               (1 << MV_BIT_RIGHT)
+#define MV_UP                  (1 << MV_BIT_UP)
+#define MV_DOWN                        (1 << MV_BIT_DOWN)
 #define KEY_BUTTON_1           (1 << 4)
 #define KEY_BUTTON_2           (1 << 5)
 #define KEY_MOTION             (MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)
 #define KEY_BUTTON             (KEY_BUTTON_1 | KEY_BUTTON_2)
 #define KEY_ACTION             (KEY_MOTION | KEY_BUTTON)
 
+#define MV_DIR_BIT(x)          ((x) == MV_LEFT  ? MV_BIT_LEFT  :       \
+                                (x) == MV_RIGHT ? MV_BIT_RIGHT :       \
+                                (x) == MV_UP    ? MV_BIT_UP    : MV_BIT_DOWN)
+
 /* values for button status */
 #define MB_NOT_PRESSED         FALSE
 #define MB_NOT_RELEASED                TRUE
@@ -467,7 +477,7 @@ struct ArtworkListInfo
   int num_suffix_list_entries;
 
   struct FileInfo *file_list;                  /* static artwork file array */
-  char **suffix_list;                          /* parameter suffixes array */
+  struct ConfigInfo *suffix_list;              /* parameter suffixes array */
 
   struct ListNodeInfo **artwork_list;          /* static artwork node array */