X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=d9cd579a5b8824218d0d88bd8fa45e9a8446e46e;hb=9ec014a4e4a6a2332bb45c6cea8cccc46c64c6ae;hp=2db287abd627147fa960ee94756e1c7817e6405a;hpb=7119b5d2e756b1ab23818ea39d19aece0563bab0;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 2db287ab..d9cd579a 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 */
+#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 *);
@@ -286,6 +290,18 @@ struct AudioSystemInfo
   int first_sound_channel;
 };
 
+struct FontBitmapInfo
+{
+  Bitmap *bitmap;
+  int src_x, src_y;		/* start position of animation frames */
+  int width, height;		/* width/height of each animation frame */
+  int draw_x, draw_y;		/* offset for drawing font characters */
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  Pixmap *clip_mask;		/* single-char-only clip mask array for X11 */
+#endif
+};
+
 struct GfxInfo
 {
   int sx, sy;
@@ -307,20 +323,12 @@ struct GfxInfo
   int background_bitmap_mask;
 
   boolean menu_main_hide_static_text;
-};
 
-struct FontInfo
-{
-  Bitmap *bitmap_initial;
-  Bitmap *bitmap_big;
-  Bitmap *bitmap_medium;
-  Bitmap *bitmap_small;
-  Bitmap *bitmap_tile;
-};
+  int num_fonts;
+  struct FontBitmapInfo *font_bitmap_info;
+  int (*select_font_function)(int);
 
-struct AnimInfo
-{
-  int random_frame;
+  int anim_random_frame;
 };
 
 struct JoystickInfo
@@ -500,8 +508,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 +544,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;
@@ -578,7 +585,6 @@ extern struct OptionInfo	options;
 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;