X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=3791f1e6523b07e16e7d70b6886f5b22a01cefc0;hb=401f78b66d66488fe465945bef36b10faa6b55ef;hp=331522ac7e398d2365c69513173a581c579211e7;hpb=0868de4751d9e3d4b2f3185c52edb5569217d39a;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 331522ac..3791f1e6 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -196,11 +196,30 @@
 #define ANIM_VERTICAL		(1 << 11)
 #define ANIM_CENTERED		(1 << 12)
 #define ANIM_STATIC_PANEL	(1 << 13)
-#define ANIM_FADE		(1 << 14)
-#define ANIM_CROSSFADE		(1 << 15)
 
 #define ANIM_DEFAULT		ANIM_LOOP
 
+/* values for fade mode */
+#define FADE_TYPE_NONE		0
+#define FADE_TYPE_FADE_IN	(1 << 0)
+#define FADE_TYPE_FADE_OUT	(1 << 1)
+#define FADE_TYPE_TRANSFORM	(1 << 2)
+#define FADE_TYPE_CROSSFADE	(1 << 3)
+#define FADE_TYPE_MELT		(1 << 4)
+#define FADE_TYPE_SKIP		(1 << 5)
+
+#define FADE_MODE_NONE		(FADE_TYPE_NONE)
+#define FADE_MODE_FADE_IN	(FADE_TYPE_FADE_IN)
+#define FADE_MODE_FADE_OUT	(FADE_TYPE_FADE_OUT)
+#define FADE_MODE_FADE		(FADE_TYPE_FADE_IN | FADE_TYPE_FADE_OUT)
+#define FADE_MODE_TRANSFORM	(FADE_TYPE_TRANSFORM | FADE_TYPE_FADE_IN)
+#define FADE_MODE_CROSSFADE	(FADE_MODE_TRANSFORM | FADE_TYPE_CROSSFADE)
+#define FADE_MODE_MELT		(FADE_MODE_TRANSFORM | FADE_TYPE_MELT)
+#define FADE_MODE_SKIP_FADE_IN	(FADE_TYPE_SKIP | FADE_TYPE_FADE_IN)
+#define FADE_MODE_SKIP_FADE_OUT	(FADE_TYPE_SKIP | FADE_TYPE_FADE_OUT)
+
+#define FADE_MODE_DEFAULT	FADE_MODE_FADE
+
 /* values for text alignment */
 #define ALIGN_LEFT		(1 << 0)
 #define ALIGN_RIGHT		(1 << 1)
@@ -244,10 +263,6 @@
 #define REDRAW_FPS		(1 << 11)
 #define REDRAWTILES_THRESHOLD	(SCR_FIELDX * SCR_FIELDY / 2)
 
-#define FADE_MODE_FADE_IN	0
-#define FADE_MODE_FADE_OUT	1
-#define FADE_MODE_CROSSFADE	2
-
 #define IN_GFX_SCREEN(x, y)	(x >= gfx.sx && x < gfx.sx + gfx.sxsize && \
 				 y >= gfx.sy && y < gfx.sy + gfx.sysize)
 #define IN_GFX_DOOR(x, y)	(x >= gfx.dx && x < gfx.dx + gfx.dxsize && \
@@ -333,6 +348,22 @@
 #define MUS_CLASSIC_SUBDIR	"mus_orig"
 #endif
 
+#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"
+#endif
+
 /* file names and filename extensions */
 #if !defined(PLATFORM_MSDOS)
 #define LEVELSETUP_DIRECTORY	"levelsetup"
@@ -510,6 +541,13 @@
 				 (setup).override_level_sounds :	\
 				 (setup).override_level_music)
 
+#define GFX_OVERRIDE_ARTWORK(type)					\
+				((type) == ARTWORK_TYPE_GRAPHICS ?	\
+				 gfx.override_level_graphics :		\
+				 (type) == ARTWORK_TYPE_SOUNDS ?	\
+				 gfx.override_level_sounds :		\
+				 gfx.override_level_music)
+
 #define ARTWORK_FIRST_NODE(artwork, type)				\
 				((type) == ARTWORK_TYPE_GRAPHICS ?	\
 				 (artwork).gfx_first :			\
@@ -555,6 +593,12 @@
 				 (type) == ARTWORK_TYPE_MUSIC ?		\
 				 options.music_directory : "")
 
+#define UPDATE_BUSY_STATE()			\
+{						\
+  if (gfx.draw_busy_anim_function != NULL)	\
+    gfx.draw_busy_anim_function();		\
+}
+
 
 /* type definitions */
 typedef int (*EventFilter)(const Event *);
@@ -612,6 +656,7 @@ struct OptionInfo
   boolean network;
   boolean verbose;
   boolean debug;
+  boolean debug_x11_sync;
 };
 
 struct ScreenModeInfo
@@ -689,11 +734,20 @@ struct GfxInfo
   Bitmap *background_bitmap;
   int background_bitmap_mask;
 
+  boolean override_level_graphics;
+  boolean override_level_sounds;
+  boolean override_level_music;
+
+  boolean draw_init_text;
+
   int num_fonts;
   struct FontBitmapInfo *font_bitmap_info;
   int (*select_font_function)(int);
+  int (*get_font_from_token_function)(char *);
 
   int anim_random_frame;
+
+  void (*draw_busy_anim_function)(void);
 };
 
 struct JoystickInfo
@@ -793,9 +847,8 @@ struct SetupInfo
   boolean sound_music;
   boolean sound_simple;
   boolean toons;
-  boolean double_buffering;
-  boolean direct_draw;		/* !double_buffering (redundant!) */
   boolean scroll_delay;
+  boolean scroll_delay_value;
   boolean soft_scrolling;
   boolean fade_screens;
   boolean autorecord;
@@ -817,9 +870,9 @@ struct SetupInfo
   char *graphics_set;
   char *sounds_set;
   char *music_set;
-  boolean override_level_graphics;
-  boolean override_level_sounds;
-  boolean override_level_music;
+  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;
@@ -947,6 +1000,7 @@ struct FileInfo
 
   boolean redefined;
   boolean fallback_to_default;
+  boolean default_is_cloned;
 };
 
 struct SetupFileList
@@ -1033,8 +1087,11 @@ struct TextPosInfo
   int x, y;
   int width, height;
   int align, valign;
-  int chars;
+  int size;
   int font, font_alt;
+  boolean draw_masked;
+  int sort_priority;
+  int id;
 };
 
 
@@ -1088,6 +1145,8 @@ 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 InitGfxDrawBusyAnimFunction(void (*draw_busy_anim_function)(void));
+void InitGfxCustomArtworkInfo();
 void SetDrawDeactivationMask(int);
 void SetDrawBackgroundMask(int);
 void SetWindowBackgroundBitmap(Bitmap *);