X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=423f49c5d56f1540924991a660d5b679f153a887;hb=8458af9ed76d6194de77b184e4e1ba2041e6aa17;hp=fa722636b27c57679d7628e3f2b6777bb4525836;hpb=7b47ce7ba0f673f0de5130daf5726104d0b38902;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index fa722636..423f49c5 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -206,7 +206,7 @@
 #define VERSION_PATCH(x)	((x) % 100)
 
 /* functions for parent/child process identification */
-#define IS_PARENT_PROCESS(pid)	((pid) > 0)
+#define IS_PARENT_PROCESS(pid)	((pid) > 0 || (pid) == -1)
 #define IS_CHILD_PROCESS(pid)	((pid) == 0)
 
 
@@ -511,23 +511,45 @@ struct ListNodeInfo
   int num_references;
 };
 
+struct PropertyMapping
+{
+  int base_index;
+  int ext1_index;
+  int ext2_index;
+
+  int artwork_index;
+};
+
 struct ArtworkListInfo
 {
   int type;					/* type of artwork */
 
   int num_file_list_entries;
-  int num_suffix_list_entries;
-  int num_ext1_suffix_list_entries;
-  int num_ext2_suffix_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 */
-  struct ConfigInfo *ext1_suffix_list;		/* property suffixes array 1 */
-  struct ConfigInfo *ext2_suffix_list;		/* property suffixes array 2 */
-  struct SetupFileList *custom_setup_list;	/* additional definitions */
 
-  struct ListNodeInfo **artwork_list;		/* static artwork node array */
+  int num_base_prefixes;
+  int num_ext1_suffixes;
+  int num_ext2_suffixes;
+
+  char **base_prefixes;				/* base token prefixes array */
+  char **ext1_suffixes;				/* property suffixes array 1 */
+  char **ext2_suffixes;				/* property suffixes array 2 */
+
+  int num_property_mapping_entries;
 
+  struct PropertyMapping *property_mapping;	/* mapping token -> artwork */
+
+  int sizeof_artwork_list_entry;
+
+  struct ListNodeInfo **artwork_list;		/* static artwork node array */
+  struct ListNodeInfo **dynamic_artwork_list;	/* dynamic artwrk node array */
   struct ListNode *content_list;		/* dynamic artwork node list */
 
   void *(*load_artwork)(char *);		/* constructor function */