X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=4383b60b1ab97bc78a9046d12407baf66cabcdea;hb=0d4ace80d081e080a704ee15227e209d5953e325;hp=9b077498a6d0c069a14573354bc3d1c86d23ceee;hpb=852a8eef1e8858a40da0be4093eba3deaf468f51;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 9b077498..4383b60b 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -72,6 +72,18 @@
 #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
+#define DEFAULT_KEY_SNAP_LEFT		KSYM_UNDEFINED
+#define DEFAULT_KEY_SNAP_RIGHT		KSYM_UNDEFINED
+#define DEFAULT_KEY_SNAP_UP		KSYM_UNDEFINED
+#define DEFAULT_KEY_SNAP_DOWN		KSYM_UNDEFINED
 
 /* values for key_status */
 #define KEY_NOT_PRESSED			FALSE
@@ -122,6 +134,8 @@
 #define BUTTON_1			4
 #define BUTTON_2			5
 
+#define NUM_PLAYER_ACTIONS		6
+
 /* values for special "focus player" bitmasks */
 #define BIT_SET_FOCUS			6
 
@@ -145,6 +159,8 @@
 
 #define KEY_BUTTON_1		(1 << BUTTON_1)
 #define KEY_BUTTON_2		(1 << BUTTON_2)
+#define KEY_BUTTON_SNAP		KEY_BUTTON_1
+#define KEY_BUTTON_DROP		KEY_BUTTON_2
 #define KEY_MOTION		(MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)
 #define KEY_BUTTON		(KEY_BUTTON_1 | KEY_BUTTON_2)
 #define KEY_ACTION		(KEY_MOTION | KEY_BUTTON)
@@ -199,6 +215,13 @@
 
 #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)
@@ -650,12 +673,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
@@ -725,6 +752,8 @@ struct GfxInfo
   int vx, vy;
   int vxsize, vysize;
 
+  int win_xsize, win_ysize;
+
   int draw_deactivation_mask;
   int draw_background_mask;
 
@@ -733,6 +762,10 @@ 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;
@@ -828,6 +861,21 @@ 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;
+
+  Key snap_left;
+  Key snap_right;
+  Key snap_up;
+  Key snap_down;
 };
 
 struct SetupSystemInfo
@@ -865,14 +913,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;
@@ -920,6 +968,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) */
@@ -1075,6 +1125,13 @@ struct Rect
   int width, height;
 };
 
+struct RectWithBorder
+{
+  int x, y;
+  int width, height;
+  int border_size;
+};
+
 struct MenuPosInfo
 {
   int x, y;
@@ -1144,7 +1201,9 @@ 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);
@@ -1158,6 +1217,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,