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

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 423f49c5..511355d3 100644
--- 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 */
-#define IS_PARENT_PROCESS(pid)	((pid) > 0 || (pid) == -1)
-#define IS_CHILD_PROCESS(pid)	((pid) == 0)
-
+#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 *);
@@ -305,6 +309,8 @@ struct GfxInfo
 
   Bitmap *background_bitmap;
   int background_bitmap_mask;
+
+  boolean menu_main_hide_static_text;
 };
 
 struct FontInfo
@@ -316,6 +322,11 @@ struct FontInfo
   Bitmap *bitmap_tile;
 };
 
+struct AnimInfo
+{
+  int random_frame;
+};
+
 struct JoystickInfo
 {
   int status;
@@ -493,8 +504,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
@@ -516,6 +529,7 @@ struct PropertyMapping
   int base_index;
   int ext1_index;
   int ext2_index;
+  int ext3_index;
 
   int artwork_index;
 };
@@ -526,24 +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;
@@ -567,6 +582,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;
@@ -645,6 +661,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);