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

diff --git a/src/libgame/system.h b/src/libgame/system.h
index cbcf5c86..df95c9d3 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -73,6 +73,7 @@
 #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_EXTRA		KSYM_UNDEFINED
 #define DEFAULT_KEY_TAPE_STOP		KSYM_UNDEFINED
 #define DEFAULT_KEY_TAPE_PAUSE		KSYM_UNDEFINED
 #define DEFAULT_KEY_TAPE_RECORD		KSYM_UNDEFINED
@@ -80,6 +81,10 @@
 #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
@@ -130,6 +135,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
 
@@ -153,6 +160,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)
@@ -295,6 +304,7 @@
 #define GAME_FRAME_DELAY	20	/* frame delay in milliseconds */
 #define FFWD_FRAME_DELAY	10	/* 200% speed for fast forward */
 #define FRAMES_PER_SECOND	(ONE_SECOND_DELAY / GAME_FRAME_DELAY)
+#define FRAMES_PER_SECOND_SP	35
 
 /* maximum playfield size supported by libgame functions */
 #define MAX_PLAYFIELD_WIDTH	128
@@ -306,6 +316,9 @@
 /* maximum allowed length of player name */
 #define MAX_PLAYER_NAME_LEN	10
 
+/* maximum number of levels in a level set */
+#define MAX_LEVELS		1000
+
 /* default name for empty highscore entry */
 #define EMPTY_PLAYER_NAME	"no name"
 
@@ -494,16 +507,20 @@
 #define TREE_TYPE_SOUNDS_DIR	ARTWORK_TYPE_SOUNDS
 #define TREE_TYPE_MUSIC_DIR	ARTWORK_TYPE_MUSIC
 #define TREE_TYPE_LEVEL_DIR	3
+#define TREE_TYPE_LEVEL_NR	4
 
-#define NUM_TREE_TYPES		4
+#define NUM_TREE_TYPES		5
 
 #define INFOTEXT_UNDEFINED	""
 #define INFOTEXT_GRAPHICS_DIR	"Custom Graphics"
 #define INFOTEXT_SOUNDS_DIR	"Custom Sounds"
 #define INFOTEXT_MUSIC_DIR	"Custom Music"
 #define INFOTEXT_LEVEL_DIR	"Level Sets"
+#define INFOTEXT_LEVEL_NR	"Levels"
 
-#define TREE_INFOTEXT(t)	((t) == TREE_TYPE_LEVEL_DIR ?		\
+#define TREE_INFOTEXT(t)	((t) == TREE_TYPE_LEVEL_NR ?		\
+				 INFOTEXT_LEVEL_NR :			\
+				 (t) == TREE_TYPE_LEVEL_DIR ?		\
 				 INFOTEXT_LEVEL_DIR :			\
 				 (t) == TREE_TYPE_GRAPHICS_DIR ?	\
 				 INFOTEXT_GRAPHICS_DIR :		\
@@ -855,6 +872,7 @@ struct SetupShortcutInfo
   Key focus_player_all;
 
   Key tape_eject;
+  Key tape_extra;
   Key tape_stop;
   Key tape_pause;
   Key tape_record;
@@ -863,6 +881,11 @@ struct SetupShortcutInfo
   Key sound_simple;
   Key sound_loops;
   Key sound_music;
+
+  Key snap_left;
+  Key snap_right;
+  Key snap_up;
+  Key snap_down;
 };
 
 struct SetupSystemInfo
@@ -901,6 +924,7 @@ struct SetupInfo
   boolean prefer_aga_graphics;
   int game_frame_delay;
   boolean sp_show_border_elements;
+  boolean small_game_graphics;
 
   char *graphics_set;
   char *sounds_set;
@@ -1138,6 +1162,12 @@ struct TextPosInfo
   int id;
 };
 
+struct LevelStats
+{
+  int played;
+  int solved;
+};
+
 
 /* ========================================================================= */
 /* exported variables                                                        */
@@ -1158,6 +1188,8 @@ extern LevelDirTree	       *leveldir_first;
 extern LevelDirTree	       *leveldir_current;
 extern int			level_nr;
 
+extern struct LevelStats	level_stats[];
+
 extern Display		       *display;
 extern Visual		       *visual;
 extern int			screen;
@@ -1207,6 +1239,7 @@ 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 BlitBitmapTiled(Bitmap *, Bitmap *, int, int, int, int, int, int, int,int);
 void FadeRectangle(Bitmap *bitmap, int, int, int, int, int, int, int,
 		   void (*draw_border_function)(void));
 void FillRectangle(Bitmap *, int, int, int, int, Pixel);