rnd-20030331-1-src

[rocksndiamonds.git] / src / libgame / system.h

diff --git a/src/libgame/system.h b/src/libgame/system.h
index bce82b93821f67623f326e0c96fb33603f0624c2..2abb3cdda2cc7d64f4e0e27f42b1144b1c15acfc 100644 (file)
--- 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"
@@ -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)
@@ -147,6 +153,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))
@@ -322,10 +331,9 @@ struct GfxInfo
   Bitmap *background_bitmap;
   int background_bitmap_mask;
 
-  boolean menu_main_hide_static_text;
-
   int num_fonts;
-  struct FontBitmapInfo *font;
+  struct FontBitmapInfo *font_bitmap_info;
+  int (*select_font_function)(int);
 
   int anim_random_frame;
 };
@@ -383,6 +391,12 @@ struct SetupShortcutInfo
   Key toggle_pause;
 };
 
+struct SetupSystemInfo
+{
+  char *sdl_audiodriver;
+  int audio_fragment_size;
+};
+
 struct SetupInfo
 {
   char *player_name;
@@ -415,6 +429,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
@@ -613,14 +629,13 @@ 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 InitGfxDoor1Info(int, int, int, int);
 void InitGfxDoor2Info(int, int, int, int);