rnd-20030210-2-src

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

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 2db287abd627147fa960ee94756e1c7817e6405a..511355d31e0ce28a64ce8d9f98393065978d5b12 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -206,9 +206,13 @@
 #define VERSION_PATCH(x)       ((x) % 100)
 
 /* functions for parent/child process identification */
+#if defined(PLATFORM_UNIX)
 #define IS_PARENT_PROCESS()    (audio.mixer_pid != getpid())
 #define IS_CHILD_PROCESS()     (audio.mixer_pid == getpid())
-
+#else
+#define IS_PARENT_PROCESS()    TRUE
+#define IS_CHILD_PROCESS()     FALSE
+#endif
 
 /* type definitions */
 typedef int (*EventFilter)(const Event *);
@@ -500,8 +504,8 @@ struct FileInfo
   char *default_filename;
   char *filename;
 
-  int *default_parameter;                      /* array of file parameters */
-  int *parameter;                              /* array of file parameters */
+  char **default_parameter;                    /* array of file parameters */
+  char **parameter;                            /* array of file parameters */
 
   boolean redefined;
 };
@@ -536,26 +540,25 @@ struct ArtworkListInfo
 
   int num_file_list_entries;
   int num_dynamic_file_list_entries;
-
   struct FileInfo *file_list;                  /* static artwork file array */
   struct FileInfo *dynamic_file_list;          /* dynamic artwrk file array */
 
   int num_suffix_list_entries;
-
   struct ConfigInfo *suffix_list;              /* parameter suffixes array */
 
   int num_base_prefixes;
   int num_ext1_suffixes;
   int num_ext2_suffixes;
   int num_ext3_suffixes;
-
   char **base_prefixes;                                /* base token prefixes array */
   char **ext1_suffixes;                                /* property suffixes array 1 */
   char **ext2_suffixes;                                /* property suffixes array 2 */
   char **ext3_suffixes;                                /* property suffixes array 3 */
 
-  int num_property_mapping_entries;
+  int num_ignore_tokens;
+  char **ignore_tokens;                                /* file tokens to be ignored */
 
+  int num_property_mapping_entries;
   struct PropertyMapping *property_mapping;    /* mapping token -> artwork */
 
   int sizeof_artwork_list_entry;