X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=af6b95a259e841b9775811103dd640ad1317be01;hb=5dd3c868d9df906623a5fc0ff2124655a14e3715;hp=d1c41d2a91164a39378f07590767a0b548bf61c3;hpb=1bd9644544424ed912d886777c6e8ed387aac24a;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index d1c41d2a..af6b95a2 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -55,10 +55,10 @@
 #define DEFAULT_KEY_DOWN	KSYM_Down
 #if defined(PLATFORM_MACOSX)
 #define DEFAULT_KEY_SNAP	KSYM_Control_L
-#define DEFAULT_KEY_BOMB	KSYM_KP_Enter
+#define DEFAULT_KEY_DROP	KSYM_KP_Enter
 #else
-#define DEFAULT_KEY_SNAP	KSYM_Shift_L
-#define DEFAULT_KEY_BOMB	KSYM_Shift_R
+#define DEFAULT_KEY_SNAP	KSYM_Control_L
+#define DEFAULT_KEY_DROP	KSYM_Control_R
 #endif
 #define DEFAULT_KEY_OKAY	KSYM_Return
 #define DEFAULT_KEY_CANCEL	KSYM_Escape
@@ -157,6 +157,12 @@
 #define REDRAW_FPS		(1 << 11)
 #define REDRAWTILES_THRESHOLD	(SCR_FIELDX * SCR_FIELDY / 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 && \
+				 y >= gfx.dy && y < gfx.dy + gfx.dysize)
+#define IN_GFX_VIDEO(x, y)	(x >= gfx.vx && x < gfx.vx + gfx.vxsize && \
+				 y >= gfx.vy && y < gfx.vy + gfx.vysize)
 
 /* values for mouse cursor */
 #define CURSOR_DEFAULT		0
@@ -175,6 +181,9 @@
 /* default name for unknown player names */
 #define ANONYMOUS_NAME		"anonymous"
 
+/* default for other unknown names */
+#define UNKNOWN_NAME		"unknown"
+
 /* default name for new levels */
 #define NAMELESS_LEVEL_NAME	"nameless level"
 
@@ -227,6 +236,9 @@
 #define LEVELSETUP_DIRECTORY	"levelsetup"
 #define SETUP_FILENAME		"setup.conf"
 #define LEVELSETUP_FILENAME	"levelsetup.conf"
+#define EDITORSETUP_FILENAME	"editorsetup.conf"
+#define HELPANIM_FILENAME	"helpanim.conf"
+#define HELPTEXT_FILENAME	"helptext.conf"
 #define LEVELINFO_FILENAME	"levelinfo.conf"
 #define GRAPHICSINFO_FILENAME	"graphicsinfo.conf"
 #define SOUNDSINFO_FILENAME	"soundsinfo.conf"
@@ -238,6 +250,9 @@
 #define LEVELSETUP_DIRECTORY	"lvlsetup"
 #define SETUP_FILENAME		"setup.cnf"
 #define LEVELSETUP_FILENAME	"lvlsetup.cnf"
+#define EDITORSETUP_FILENAME	"edsetup.cnf"
+#define HELPANIM_FILENAME	"helpanim.conf"
+#define HELPTEXT_FILENAME	"helptext.conf"
 #define LEVELINFO_FILENAME	"lvlinfo.cnf"
 #define GRAPHICSINFO_FILENAME	"gfxinfo.cnf"
 #define SOUNDSINFO_FILENAME	"sndinfo.cnf"
@@ -269,12 +284,11 @@
 
 
 /* macros for version handling */
-#define VERSION_IDENT(x,y,z)	((x) * 1000000 + (y) * 10000 + (z) * 100)
-#define RELEASE_IDENT(x,y,z,r)	(VERSION_IDENT(x,y,z) + (r))
 #define VERSION_MAJOR(x)	((x) / 1000000)
 #define VERSION_MINOR(x)	(((x) % 1000000) / 10000)
 #define VERSION_PATCH(x)	(((x) % 10000) / 100)
-#define VERSION_RELEASE(x)	((x) % 100)
+#define VERSION_BUILD(x)	((x) % 100)
+#define VERSION_IDENT(a,b,c,d)	((a) * 1000000 + (b) * 10000 + (c) * 100 + (d))
 
 
 /* macros for parent/child process identification */
@@ -507,18 +521,13 @@ struct SetupJoystickInfo
 
   int xleft, xmiddle, xright;
   int yupper, ymiddle, ylower;
-  int snap;
-  int bomb;
+  int snap, drop;
 };
 
 struct SetupKeyboardInfo
 {
-  Key left;
-  Key right;
-  Key up;
-  Key down;
-  Key snap;
-  Key bomb;
+  Key left, right, up, down;
+  Key snap, drop;
 };
 
 struct SetupInputInfo
@@ -540,6 +549,7 @@ struct SetupEditorInfo
   boolean el_chars;
   boolean el_custom;
   boolean el_custom_more;
+  boolean el_user_defined;
 
   boolean el_headlines;
 };
@@ -607,7 +617,7 @@ struct TreeInfo
 
   /* fields for "type == TREE_TYPE_LEVEL_DIR" */
 
-  char *filename;	/* tree info sub-directory basename (may be ".") */
+  char *subdir;		/* tree info sub-directory basename (may be ".") */
   char *fullpath;	/* complete path relative to tree base directory */
   char *basepath;	/* absolute base path of tree base directory */
   char *identifier;	/* identifier string for configuration files */
@@ -623,11 +633,16 @@ struct TreeInfo
   char *sounds_path;	/* path to optional custom sounds set (level only) */
   char *music_path;	/* path to optional custom music set (level only) */
 
+  char *level_filename;	/* filename of level file (for packed level file) */
+  char *level_filetype;	/* type of levels in level directory or 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) */
   int sort_priority;	/* sort levels by 'sort_priority' and then by name */
 
+  boolean latest_engine;/* force level set to use the latest game engine */
+
   boolean level_group;	/* directory contains more level series directories */
   boolean parent_link;	/* entry links back to parent directory */
   boolean user_defined;	/* user defined levels are stored in home directory */