X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=0ccf0a2904bd78c0d2df5ed6f4cc59f12f35676b;hb=0bc034af5fcbf709be96723aff7ec5bc0c3c7baf;hp=0183b0665e795b09c8cbb3c4677ac3ad86b046e2;hpb=e2b2b44c56f55520c8cc43cf361c83a12e60f7b0;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 0183b066..0ccf0a29 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -100,7 +100,7 @@
 #define BUTTON_2		5
 
 /* values for move directions and special "button" key bitmasks */
-#define MV_NO_MOVING		0
+#define MV_NONE			0
 #define MV_LEFT			(1 << MV_BIT_LEFT)
 #define MV_RIGHT		(1 << MV_BIT_RIGHT)
 #define MV_UP			(1 << MV_BIT_UP)
@@ -110,6 +110,7 @@
 #define MV_VERTICAL		(MV_UP   | MV_DOWN)
 #define MV_ALL_DIRECTIONS	(MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)
 #define MV_ANY_DIRECTION	(MV_ALL_DIRECTIONS)
+#define MV_NO_DIRECTION		(MV_NONE)
 
 #define KEY_BUTTON_1		(1 << BUTTON_1)
 #define KEY_BUTTON_2		(1 << BUTTON_2)
@@ -124,7 +125,7 @@
 #define MV_DIR_OPPOSITE(x)	((x) == MV_LEFT  ? MV_RIGHT :		\
 				 (x) == MV_RIGHT ? MV_LEFT  :		\
 				 (x) == MV_UP    ? MV_DOWN  :		\
-				 (x) == MV_DOWN  ? MV_UP    : MV_NO_MOVING)
+				 (x) == MV_DOWN  ? MV_UP    : MV_NONE)
 
 
 /* values for animation mode (frame order and direction) */
@@ -336,6 +337,13 @@
 
 
 /* values for artwork handling */
+#define LEVELDIR_ARTWORK_SET_PTR(leveldir, type)			\
+				((type) == ARTWORK_TYPE_GRAPHICS ?	\
+				 &(leveldir)->graphics_set :		\
+				 (type) == ARTWORK_TYPE_SOUNDS ?	\
+				 &(leveldir)->sounds_set :		\
+	 			 &(leveldir)->music_set)
+
 #define LEVELDIR_ARTWORK_SET(leveldir, type)				\
 				((type) == ARTWORK_TYPE_GRAPHICS ?	\
 				 (leveldir)->graphics_set :		\
@@ -343,6 +351,13 @@
 				 (leveldir)->sounds_set :		\
 	 			 (leveldir)->music_set)
 
+#define LEVELDIR_ARTWORK_PATH_PTR(leveldir, type)			\
+				((type) == ARTWORK_TYPE_GRAPHICS ?	\
+				 &(leveldir)->graphics_path :		\
+				 (type) == ARTWORK_TYPE_SOUNDS ?	\
+				 &(leveldir)->sounds_path :		\
+				 &(leveldir)->music_path)
+
 #define LEVELDIR_ARTWORK_PATH(leveldir, type)				\
 				((type) == ARTWORK_TYPE_GRAPHICS ?	\
 				 (leveldir)->graphics_path :		\
@@ -371,6 +386,13 @@
 				 (artwork).snd_first :	\
 				 (artwork).mus_first)
 
+#define ARTWORK_CURRENT_IDENTIFIER_PTR(artwork, type)			\
+				((type) == ARTWORK_TYPE_GRAPHICS ?	\
+				 &(artwork).gfx_current_identifier :	\
+				 (type) == ARTWORK_TYPE_SOUNDS ?	\
+				 &(artwork).snd_current_identifier :	\
+				 &(artwork).mus_current_identifier)
+
 #define ARTWORK_CURRENT_IDENTIFIER(artwork, type)			\
 				((type) == ARTWORK_TYPE_GRAPHICS ?	\
 				 (artwork).gfx_current_identifier :	\
@@ -411,8 +433,9 @@ typedef int (*EventFilter)(const Event *);
 
 struct ProgramInfo
 {
-  char *command_basename;
-  char *userdata_directory;
+  char *command_basepath;	/* directory that contains the program */
+  char *command_basename;	/* base filename of the program binary */
+  char *userdata_directory;	/* personal user data directory */
 
   char *program_title;
   char *window_title;
@@ -600,6 +623,7 @@ struct SetupInfo
   boolean quick_doors;
   boolean team_mode;
   boolean handicap;
+  boolean skip_levels;
   boolean time_limit;
   boolean fullscreen;
   boolean ask_on_escape;
@@ -661,9 +685,11 @@ struct TreeInfo
 
   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 */
+  boolean in_user_dir;	/* user defined levels are stored in home directory */
+  boolean user_defined;	/* levels in user directory and marked as "private" */
   boolean readonly;	/* readonly levels can not be changed with editor */
   boolean handicap;	/* level set has no handicap when set to "false" */
+  boolean skip_levels;	/* levels can be skipped when set to "true" */
 
   int color;		/* color to use on selection screen for this level */
   char *class_desc;	/* description of level series class */
@@ -892,6 +918,7 @@ inline void SetAudioMode(boolean);
 inline void InitEventFilter(EventFilter);
 inline boolean PendingEvent(void);
 inline void NextEvent(Event *event);
+inline void PeekEvent(Event *event);
 inline Key GetEventKey(KeyEvent *, boolean);
 inline KeyMod HandleKeyModState(Key, int);
 inline KeyMod GetKeyModState();