X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=c5afeada6b675749eae68fe2e82a09e4f0100259;hb=6ed4958820f8f97174ca47594dcc6f00ee31b2cb;hp=3577e35913b1831af8ad1c5f006d2d137b170a4d;hpb=14089dac2cbe56e563863e1e5adb8847944fd262;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 3577e359..c5afeada 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -17,7 +17,12 @@
 #include "platform.h"
 #include "types.h"
 
-#if defined(PLATFORM_MSDOS)
+
+#if defined(PLATFORM_MACOSX)
+#include "macosx.h"
+#elif defined(PLATFORM_WIN32)
+#include "windows.h"
+#elif defined(PLATFORM_MSDOS)
 #include "msdos.h"
 #endif
 
@@ -27,14 +32,6 @@
 #include "x11.h"
 #endif
 
-#if defined(PLATFORM_MACOSX)
-/* some symbols are already defined on Mac OS X */
-#define Delay Delay_internal
-#define DrawLine DrawLine_internal
-#define DrawText DrawText_internal
-#define GetPixel GetPixel_internal
-#endif
-
 
 /* the additional 'b' is needed for Win32 to open files in binary mode */
 #define MODE_READ		"rb"
@@ -71,7 +68,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)
@@ -101,6 +98,15 @@
 #define MB_MIDDLEBUTTON		2
 #define MB_RIGHTBUTTON		3
 
+/* values for animation mode (frame order and direction) */
+#define ANIM_NONE		0
+#define ANIM_LOOP		(1 << 0)
+#define ANIM_LINEAR		(1 << 1)
+#define ANIM_PINGPONG		(1 << 2)
+#define ANIM_PINGPONG2		(1 << 3)
+#define ANIM_RANDOM		(1 << 4)
+#define ANIM_REVERSE		(1 << 5)
+
 /* values for redraw_mask */
 #define REDRAW_NONE		(0)
 #define REDRAW_ALL		(1 << 0)
@@ -138,14 +144,21 @@
 /* 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 value for undefined parameter */
+#define ARG_DEFAULT		"[DEFAULT]"
+
+/* 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 +215,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 +299,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;
@@ -296,18 +325,19 @@ struct GfxInfo
   int vx, vy;
   int vxsize, vysize;
 
-  boolean draw_deactivation_mask;
+  int draw_deactivation_mask;
+  int draw_background_mask;
+
+  Bitmap *field_save_buffer;
 
   Bitmap *background_bitmap;
-};
+  int background_bitmap_mask;
 
-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);
+
+  int anim_random_frame;
 };
 
 struct JoystickInfo
@@ -363,6 +393,12 @@ struct SetupShortcutInfo
   Key toggle_pause;
 };
 
+struct SetupSystemInfo
+{
+  char *sdl_audiodriver;
+  int audio_fragment_size;
+};
+
 struct SetupInfo
 {
   char *player_name;
@@ -395,6 +431,8 @@ struct SetupInfo
   struct SetupEditorInfo editor;
   struct SetupShortcutInfo shortcut;
   struct SetupInputInfo input[MAX_PLAYERS];
+  struct SetupSystemInfo system;
+  struct OptionInfo options;
 };
 
 #define TREE_TYPE_GENERIC		0
@@ -477,6 +515,7 @@ struct ConfigInfo
 {
   char *token;
   char *value;
+  int type;
 };
 
 struct FileInfo
@@ -486,8 +525,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
@@ -496,18 +545,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 */
@@ -524,7 +602,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;
@@ -553,20 +631,21 @@ extern int			FrameCounter;
 
 /* function definitions */
 
-void InitCommandName(char *);
+void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *,
+		     char *, char *, char *, int);
+
 void InitExitFunction(void (*exit_function)(int));
 void InitPlatformDependantStuff(void);
 void ClosePlatformDependantStuff(void);
 
-void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *,
-		     char *, char *, int);
-
-void InitGfxFieldInfo(int, int, int, int, int, int, int, int);
+void InitGfxFieldInfo(int, int, int, int, int, int, int, int, Bitmap *);
 void InitGfxDoor1Info(int, int, int, int);
 void InitGfxDoor2Info(int, int, int, int);
 void InitGfxScrollbufferInfo(int, int);
-void SetDrawDeactivationMask(int );
-void SetBackgroundBitmap(Bitmap *);
+void SetDrawDeactivationMask(int);
+void SetDrawBackgroundMask(int);
+void SetMainBackgroundBitmap(Bitmap *);
+void SetDoorBackgroundBitmap(Bitmap *);
 
 inline void InitVideoDisplay(void);
 inline void CloseVideoDisplay(void);
@@ -575,6 +654,7 @@ inline Bitmap *CreateBitmapStruct(void);
 inline Bitmap *CreateBitmap(int, int, int);
 inline void FreeBitmap(Bitmap *);
 inline void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int);
+inline void DrawRectangle(Bitmap *, int, int, int, int, Pixel);
 inline void ClearRectangle(Bitmap *, int, int, int, int);
 inline void ClearRectangleOnBackground(Bitmap *, int, int, int, int);
 inline void SetClipMask(Bitmap *, GC, Pixmap);
@@ -601,6 +681,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);