X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=532f079a5ca09a477cadf3955203e22696f7a8f0;hp=6ff9c39fb77599f6efa67d20dd6725159c445eef;hb=601cca5b35649856ff49e1bcb3806592b736662c;hpb=ba0568bc8d5b8b3d081691b8e987f2b66a4c13e6

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 6ff9c39f..532f079a 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -206,8 +206,8 @@
 #define VERSION_PATCH(x)	((x) % 100)
 
 /* functions for parent/child process identification */
-#define IS_PARENT_PROCESS(pid)	((pid) > 0 || (pid) == -1)
-#define IS_CHILD_PROCESS(pid)	((pid) == 0)
+#define IS_PARENT_PROCESS()	(audio.mixer_pid != getpid())
+#define IS_CHILD_PROCESS()	(audio.mixer_pid == getpid())
 
 
 /* type definitions */
@@ -305,6 +305,8 @@ struct GfxInfo
 
   Bitmap *background_bitmap;
   int background_bitmap_mask;
+
+  boolean menu_main_hide_static_text;
 };
 
 struct FontInfo
@@ -316,6 +318,11 @@ struct FontInfo
   Bitmap *bitmap_tile;
 };
 
+struct AnimInfo
+{
+  int random_frame;
+};
+
 struct JoystickInfo
 {
   int status;
@@ -493,8 +500,10 @@ 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;
 };
 
 struct SetupFileList
@@ -511,26 +520,48 @@ struct ListNodeInfo
   int num_references;
 };
 
+struct PropertyMapping
+{
+  int base_index;
+  int ext1_index;
+  int ext2_index;
+  int ext3_index;
+
+  int artwork_index;
+};
+
 struct ArtworkListInfo
 {
   int type;					/* type of artwork */
 
   int num_file_list_entries;
-  int num_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 */
 
   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 */
-  struct SetupFileList *custom_setup_list;	/* additional definitions */
+  char **ext3_suffixes;				/* property suffixes array 3 */
+
+  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 */
@@ -548,6 +579,7 @@ extern struct VideoSystemInfo	video;
 extern struct AudioSystemInfo	audio;
 extern struct GfxInfo		gfx;
 extern struct FontInfo		font;
+extern struct AnimInfo		anim;
 extern struct ArtworkInfo	artwork;
 extern struct JoystickInfo	joystick;
 extern struct SetupInfo		setup;
@@ -626,6 +658,9 @@ Bitmap *LoadImage(char *);
 Bitmap *LoadCustomImage(char *);
 void ReloadCustomImage(Bitmap *, char *);
 
+Bitmap *ZoomBitmap(Bitmap *, int, int);
+void CreateBitmapWithSmallBitmaps(Bitmap *);
+
 inline void OpenAudio(void);
 inline void CloseAudio(void);
 inline void SetAudioMode(boolean);