X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=72dbb28d46de2766ff0b1bf8360c3a8b88ec9630;hb=078d932701464a5152c3889007e5818f87f609c7;hp=03429157c7fc327273ae3da60046d424b631eb88;hpb=05ca3ceb489c27197cf846441c1464536479a5cb;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 03429157..72dbb28d 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -71,7 +71,7 @@
 #define MV_BIT_RIGHT		1
 #define MV_BIT_UP		2
 #define MV_BIT_DOWN	       	3
-#define NUM_MV_DIRECTIONS	4
+#define NUM_DIRECTIONS		4
 
 #define MV_NO_MOVING		0
 #define MV_LEFT			(1 << MV_BIT_LEFT)
@@ -138,14 +138,18 @@
 /* default name for unknown player names */
 #define ANONYMOUS_NAME		"anonymous"
 
+/* default name for new levels */
+#define NAMELESS_LEVEL_NAME	"nameless level"
+
 /* default text for non-existant artwork */
 #define NOT_AVAILABLE		"(not available)"
 
 /* default value for undefined filename */
 #define UNDEFINED_FILENAME	"[NONE]"
 
-/* default name for new levels */
-#define NAMELESS_LEVEL_NAME	"nameless level"
+/* default values for undefined configuration file parameters */
+#define ARG_UNDEFINED		"-1000000"
+#define ARG_UNDEFINED_VALUE	(atoi(ARG_UNDEFINED))
 
 /* definitions for game sub-directories */
 #ifndef RO_GAME_DIR
@@ -202,9 +206,13 @@
 #define VERSION_PATCH(x)	((x) % 100)
 
 /* functions for parent/child process identification */
-#define IS_PARENT_PROCESS(pid)	((pid) > 0)
-#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 *);
@@ -282,6 +290,18 @@ struct AudioSystemInfo
   int first_sound_channel;
 };
 
+struct FontInfo
+{
+  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;
@@ -301,15 +321,16 @@ struct GfxInfo
 
   Bitmap *background_bitmap;
   int background_bitmap_mask;
+
+  boolean menu_main_hide_static_text;
+
+  int num_fonts;
+  struct FontInfo *font;
 };
 
-struct FontInfo
+struct AnimInfo
 {
-  Bitmap *bitmap_initial;
-  Bitmap *bitmap_big;
-  Bitmap *bitmap_medium;
-  Bitmap *bitmap_small;
-  Bitmap *bitmap_tile;
+  int random_frame;
 };
 
 struct JoystickInfo
@@ -489,8 +510,18 @@ 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
+{
+  char *token;
+  char *value;
+
+  struct SetupFileList *next;
 };
 
 struct ListNodeInfo
@@ -499,18 +530,47 @@ 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 */
 
-  struct ListNodeInfo **artwork_list;		/* static artwork node 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_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;
+
+  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 */
@@ -527,7 +587,7 @@ 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;
 extern struct SetupInfo		setup;
@@ -606,6 +666,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);