X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=f00ab2a7d74187d43dc543728931be7c3b00a48a;hb=72657dfeee6b6c184a42e83ed923a63c1768100b;hp=aa5926f5fb30692019f36f80216559a3c7f80ff6;hpb=0d0e1a63d6b14109b64805bcb1a45ddf469ba35d;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index aa5926f5..f00ab2a7 100644
--- a/src/main.h
+++ b/src/main.h
@@ -100,6 +100,7 @@
 #define EP_BIT_BELT_SWITCH	(1 << 2)
 #define EP_BIT_TUBE		(1 << 3)
 #define EP_BIT_EM_SLIPPERY_WALL	(1 << 4)
+#define EP_BIT_CAN_BE_CRUMBLED	(1 << 5)
 
 #define EP_BITMASK_DEFAULT	0
 
@@ -141,6 +142,7 @@
 #define IS_BELT_SWITCH(e)	(Properties2[e] & EP_BIT_BELT_SWITCH)
 #define IS_TUBE(e)		(Properties2[e] & EP_BIT_TUBE)
 #define IS_EM_SLIPPERY_WALL(e)	(Properties2[e] & EP_BIT_EM_SLIPPERY_WALL)
+#define CAN_BE_CRUMBLED(e)	(Properties2[e] & EP_BIT_CAN_BE_CRUMBLED)
 
 #define IS_CUSTOM_ELEMENT(e)	((e) >= EL_CUSTOM_START &&	\
 	 			 (e) <= EL_CUSTOM_END)
@@ -858,10 +860,17 @@
 #define WINDOW_TITLE_STRING	PROGRAM_TITLE_STRING " " PROGRAM_IDENT_STRING
 #define WINDOW_SUBTITLE_STRING	PROGRAM_RIGHTS_STRING " " PROGRAM_AUTHOR_STRING
 #define ICON_TITLE_STRING	PROGRAM_TITLE_STRING
-#define UNIX_USERDATA_DIRECTORY	".rocksndiamonds"
 #define COOKIE_PREFIX		"ROCKSNDIAMONDS"
 #define FILENAME_PREFIX		"Rocks"
 
+#if defined(PLATFORM_UNIX)
+#define USERDATA_DIRECTORY	".rocksndiamonds"
+#elif defined(PLATFORM_WIN32)
+#define USERDATA_DIRECTORY	PROGRAM_TITLE_STRING
+#else
+#define USERDATA_DIRECTORY	"userdata"
+#endif
+
 #define X11_ICON_FILENAME	"rocks_icon.xbm"
 #define X11_ICONMASK_FILENAME	"rocks_iconmask.xbm"
 #define MSDOS_POINTER_FILENAME	"mouse.pcx"
@@ -935,9 +944,9 @@ struct PlayerInfo
 
   int last_move_dir;
   boolean is_moving;
-
-  boolean is_digging;
   boolean is_waiting;
+  boolean is_digging;
+  boolean is_collecting;
 
   unsigned long move_delay;
   int move_delay_value;
@@ -996,6 +1005,7 @@ struct TapeInfo
   int game_version;	/* game release version the tape was created with */
   int engine_version;	/* game engine version the tape was recorded with */
 
+  char *level_identifier;
   int level_nr;
   unsigned long random_seed;
   unsigned long date;
@@ -1050,6 +1060,14 @@ struct GlobalInfo
 
   int num_toons;
 
+  int menu_draw_xoffset;
+  int menu_draw_yoffset;
+  int menu_draw_xoffset_MAIN;
+  int menu_draw_yoffset_MAIN;
+
+  int door_step_offset;
+  int door_step_delay;
+
   float frames_per_second;
   boolean fps_slowdown;
   int fps_slowdown_factor;