X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=26d192e396054a31b6341b8813328c0bf6e72bbe;hp=4f8c2f93b83cc6fae05d2fb4f25b81a9f73548ca;hb=a312d80612bb9a448cdc1abbde690b296fa92b17;hpb=bca0a1d2e0c7d05f0dfb1d1c62c85715c63652ba

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 4f8c2f93..26d192e3 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -48,9 +48,6 @@
 #define FULLSCREEN_NOT_AVAILABLE	FALSE
 #define FULLSCREEN_AVAILABLE		TRUE
 
-#define CREATE_SPECIAL_EDITION		FALSE
-#define CREATE_SPECIAL_EDITION_RND_JUE	FALSE
-
 /* default input keys */
 #define DEFAULT_KEY_LEFT		KSYM_Left
 #define DEFAULT_KEY_RIGHT		KSYM_Right
@@ -342,22 +339,26 @@
 #define CACHE_DIRECTORY		"cache"
 
 #if !defined(PLATFORM_MSDOS)
-#if CREATE_SPECIAL_EDITION_RND_JUE
-#define GFX_CLASSIC_SUBDIR	"jue0"
-#define SND_CLASSIC_SUBDIR	"jue0"
-#define MUS_CLASSIC_SUBDIR	"jue0"
-#else
 #define GFX_CLASSIC_SUBDIR	"gfx_classic"
 #define SND_CLASSIC_SUBDIR	"snd_classic"
 #define MUS_CLASSIC_SUBDIR	"mus_classic"
-#endif
 #else
 #define GFX_CLASSIC_SUBDIR	"gfx_orig"
 #define SND_CLASSIC_SUBDIR	"snd_orig"
 #define MUS_CLASSIC_SUBDIR	"mus_orig"
 #endif
 
-#if CREATE_SPECIAL_EDITION
+#if defined(CREATE_SPECIAL_EDITION_RND_JUE)
+#define GFX_DEFAULT_SUBDIR	"jue0"
+#define SND_DEFAULT_SUBDIR	"jue0"
+#define MUS_DEFAULT_SUBDIR	"jue0"
+#else
+#define GFX_DEFAULT_SUBDIR	GFX_CLASSIC_SUBDIR
+#define SND_DEFAULT_SUBDIR	SND_CLASSIC_SUBDIR
+#define MUS_DEFAULT_SUBDIR	MUS_CLASSIC_SUBDIR
+#endif
+
+#if defined(CREATE_SPECIAL_EDITION)
 #define GFX_FALLBACK_FILENAME	"fallback.pcx"
 #define SND_FALLBACK_FILENAME	"fallback.wav"
 #define MUS_FALLBACK_FILENAME	"fallback.wav"
@@ -649,12 +650,16 @@ struct OptionInfo
   char *sounds_directory;
   char *music_directory;
   char *docs_directory;
+
   char *execute_command;
 
+  char *special_flags;
+
   boolean serveronly;
   boolean network;
   boolean verbose;
   boolean debug;
+  boolean debug_x11_sync;
 };
 
 struct ScreenModeInfo
@@ -724,6 +729,8 @@ struct GfxInfo
   int vx, vy;
   int vxsize, vysize;
 
+  int win_xsize, win_ysize;
+
   int draw_deactivation_mask;
   int draw_background_mask;
 
@@ -864,14 +871,14 @@ struct SetupInfo
   boolean input_on_focus;
   boolean prefer_aga_graphics;
   int game_frame_delay;
+  boolean sp_show_border_elements;
 
   char *graphics_set;
   char *sounds_set;
   char *music_set;
-  boolean override_level_graphics;
-  boolean override_level_sounds;
-  boolean override_level_music;
-  boolean auto_override_artwork;
+  int override_level_graphics;		/* not boolean -- can also be "AUTO" */
+  int override_level_sounds;		/* not boolean -- can also be "AUTO" */
+  int override_level_music;		/* not boolean -- can also be "AUTO" */
 
   struct SetupEditorInfo editor;
   struct SetupEditorCascadeInfo editor_cascade;
@@ -919,6 +926,8 @@ struct TreeInfo
   char *level_filename;	/* filename of level file (for packed level file) */
   char *level_filetype;	/* type of levels in level directory or level file */
 
+  char *special_flags;	/* flags for special actions performed on level file */
+
   int levels;		/* number of levels in level series */
   int first_level;	/* first level number (to allow start with 0 or 1) */
   int last_level;	/* last level number (automatically calculated) */
@@ -1143,6 +1152,7 @@ void ClosePlatformDependentStuff(void);
 void InitGfxFieldInfo(int, int, int, int, int, int, int, int, Bitmap *);
 void InitGfxDoor1Info(int, int, int, int);
 void InitGfxDoor2Info(int, int, int, int);
+void InitGfxWindowInfo(int, int);
 void InitGfxScrollbufferInfo(int, int);
 void InitGfxDrawBusyAnimFunction(void (*draw_busy_anim_function)(void));
 void InitGfxCustomArtworkInfo();