rnd-20020917-1-src

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

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 4bd6305ab6b10ea4729d8e8364df2e25396dc042..5072584ee6441e9e1cdd6d68513b701072ede24b 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -67,17 +67,26 @@
 #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 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 LOG_MV_DIR(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
@@ -436,27 +445,43 @@ struct ArtworkInfo
   char *mus_current_identifier;
 };
 
-struct ArtworkConfigInfo
+struct ConfigInfo
+{
+  char *token;
+  char *value;
+};
+
+struct FileInfo
 {
   char *token;
-  char *default_filename;
 
+  char *default_filename;
   char *filename;
+
+  int *default_parameter;                      /* array of file parameters */
+  int *parameter;                              /* array of file parameters */
 };
 
-struct ArtworkListNodeInfo
+struct ListNodeInfo
 {
-  char *source_filename;
+  char *source_filename;                       /* primary key for node list */
   int num_references;
 };
 
 struct ArtworkListInfo
 {
   int type;                                    /* type of artwork */
-  int num_list_entries;
-  struct ArtworkConfigInfo *config_list;       /* static config list */
-  struct ArtworkListNodeInfo **artwork_list;   /* static artwork list */
-  ListNode *file_list;                         /* dynamic artwork list */
+
+  int num_file_list_entries;
+  int num_suffix_list_entries;
+
+  struct FileInfo *file_list;                  /* static artwork file array */
+  struct ConfigInfo *suffix_list;              /* parameter suffixes array */
+
+  struct ListNodeInfo **artwork_list;          /* static artwork node array */
+
+  struct ListNode *content_list;               /* dynamic artwork node list */
+
   void *(*load_artwork)(char *);               /* constructor function */
   void (*free_artwork)(void *);                        /* destructor function */
 };