X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=cbcf5c86ae4d24abcdbb66d561b17d22fd1f9ed5;hb=44b31e75162d6e446a9e9b454a079a2da5604fdf;hp=5ba6da71edb1fbd6a6785a659a336772d941d8eb;hpb=5c94351c5b8a12d8615b447b6275dd2f68615be4;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 5ba6da71..cbcf5c86 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -72,6 +72,14 @@
 #define DEFAULT_KEY_FOCUS_PLAYER_3	KSYM_F7
 #define DEFAULT_KEY_FOCUS_PLAYER_4	KSYM_F8
 #define DEFAULT_KEY_FOCUS_PLAYER_ALL	KSYM_F9
+#define DEFAULT_KEY_TAPE_EJECT		KSYM_UNDEFINED
+#define DEFAULT_KEY_TAPE_STOP		KSYM_UNDEFINED
+#define DEFAULT_KEY_TAPE_PAUSE		KSYM_UNDEFINED
+#define DEFAULT_KEY_TAPE_RECORD		KSYM_UNDEFINED
+#define DEFAULT_KEY_TAPE_PLAY		KSYM_UNDEFINED
+#define DEFAULT_KEY_SOUND_SIMPLE	KSYM_UNDEFINED
+#define DEFAULT_KEY_SOUND_LOOPS		KSYM_UNDEFINED
+#define DEFAULT_KEY_SOUND_MUSIC		KSYM_UNDEFINED
 
 /* values for key_status */
 #define KEY_NOT_PRESSED			FALSE
@@ -199,18 +207,29 @@
 
 #define ANIM_DEFAULT		ANIM_LOOP
 
+/* values for special drawing styles (currently only for crumbled graphics) */
+#define STYLE_NONE		0
+#define STYLE_ACCURATE_BORDERS	(1 << 0)
+#define STYLE_INNER_CORNERS	(1 << 1)
+
+#define STYLE_DEFAULT		STYLE_NONE
+
 /* 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_CROSS		(1 << 2)
-#define FADE_TYPE_SKIP		(1 << 3)
+#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_CROSSFADE	(FADE_TYPE_FADE_IN | FADE_TYPE_CROSS)
+#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)
 
@@ -344,6 +363,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"
@@ -521,6 +556,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 :			\
@@ -566,6 +608,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 *);
@@ -617,12 +665,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
@@ -692,6 +744,8 @@ struct GfxInfo
   int vx, vy;
   int vxsize, vysize;
 
+  int win_xsize, win_ysize;
+
   int draw_deactivation_mask;
   int draw_background_mask;
 
@@ -700,12 +754,24 @@ struct GfxInfo
   Bitmap *background_bitmap;
   int background_bitmap_mask;
 
+  boolean clipping_enabled;
+  int clip_x, clip_y;
+  int clip_width, clip_height;
+
+  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
@@ -787,6 +853,16 @@ struct SetupShortcutInfo
 
   Key focus_player[MAX_PLAYERS];
   Key focus_player_all;
+
+  Key tape_eject;
+  Key tape_stop;
+  Key tape_pause;
+  Key tape_record;
+  Key tape_play;
+
+  Key sound_simple;
+  Key sound_loops;
+  Key sound_music;
 };
 
 struct SetupSystemInfo
@@ -805,9 +881,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;
@@ -825,13 +900,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;
+  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;
@@ -879,6 +955,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) */
@@ -959,6 +1037,7 @@ struct FileInfo
 
   boolean redefined;
   boolean fallback_to_default;
+  boolean default_is_cloned;
 };
 
 struct SetupFileList
@@ -1033,6 +1112,13 @@ struct Rect
   int width, height;
 };
 
+struct RectWithBorder
+{
+  int x, y;
+  int width, height;
+  int border_size;
+};
+
 struct MenuPosInfo
 {
   int x, y;
@@ -1045,8 +1131,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;
 };
 
 
@@ -1099,7 +1188,11 @@ 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 InitGfxClipRegion(boolean, int, int, int, int);
+void InitGfxDrawBusyAnimFunction(void (*draw_busy_anim_function)(void));
+void InitGfxCustomArtworkInfo();
 void SetDrawDeactivationMask(int);
 void SetDrawBackgroundMask(int);
 void SetWindowBackgroundBitmap(Bitmap *);
@@ -1111,6 +1204,7 @@ void CloseVideoDisplay(void);
 void InitVideoBuffer(int, int, int, boolean);
 Bitmap *CreateBitmapStruct(void);
 Bitmap *CreateBitmap(int, int, int);
+void ReCreateBitmap(Bitmap **, int, int, int);
 void FreeBitmap(Bitmap *);
 void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int);
 void FadeRectangle(Bitmap *bitmap, int, int, int, int, int, int, int,