X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=af31de3f1b7dc3516ab3fdb18cd223a30c63469a;hb=27a283729bf1e7b956c5ceba87215a6d177b4bc7;hp=672a9d1d5afe840063530be2a119890767844010;hpb=756a24e132e64d1514e85b8fa09f123e75417fd0;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 672a9d1d..af31de3f 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"
@@ -43,6 +40,9 @@
 
 #define DEFAULT_DEPTH		0
 
+#define BLIT_OPAQUE		0
+#define BLIT_MASKED		1
+
 #define FULLSCREEN_NOT_AVAILABLE FALSE
 #define FULLSCREEN_AVAILABLE	 TRUE
 
@@ -156,6 +156,9 @@
 /* default value for undefined filename */
 #define UNDEFINED_FILENAME	"[NONE]"
 
+/* 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))
@@ -328,14 +331,15 @@ struct GfxInfo
   int draw_deactivation_mask;
   int draw_background_mask;
 
+  Bitmap *field_save_buffer;
+
   Bitmap *background_bitmap;
   int background_bitmap_mask;
 
-  boolean menu_main_hide_static_text;
-
   int num_fonts;
   struct FontBitmapInfo *font_bitmap_info;
   int (*select_font_function)(int);
+  Pixel inverse_text_color;
 
   int anim_random_frame;
 };
@@ -393,6 +397,12 @@ struct SetupShortcutInfo
   Key toggle_pause;
 };
 
+struct SetupSystemInfo
+{
+  char *sdl_audiodriver;
+  int audio_fragment_size;
+};
+
 struct SetupInfo
 {
   char *player_name;
@@ -425,6 +435,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
@@ -623,15 +635,14 @@ 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);
@@ -647,6 +658,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 FillRectangle(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);