X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=9865fb1c3ab020ed85717c5bdd27c3c705b6d461;hb=b775acd8880b99487b8433280c7cdf8417ee3386;hp=8675f6720a3906ca14c633c5f4d4495413c37dad;hpb=58546d540453ea1ddf4142a3911f9873acce1132;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 8675f672..9865fb1c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -808,6 +808,9 @@
 #define IS_DC_STEELWALL_2(e)	((e) >= EL_DC_STEELWALL_2_LEFT &&	\
 				 (e) <= EL_DC_STEELWALL_2_SINGLE)
 
+// !!! IMPROVE THIS !!!
+#define IS_EM_ELEMENT(e)	(map_element_EM_to_RND_cave(map_element_RND_to_EM_cave(e)) == (e))
+
 #define MM_WALL_BASE(e)		((e) & 0xfff0)
 #define MM_WALL_BITS(e)		((e) & 0x000f)
 
@@ -2562,7 +2565,7 @@ enum
 #define PROGRAM_VERSION_SUPER		4
 #define PROGRAM_VERSION_MAJOR		2
 #define PROGRAM_VERSION_MINOR		0
-#define PROGRAM_VERSION_PATCH		3
+#define PROGRAM_VERSION_PATCH		5
 #define PROGRAM_VERSION_EXTRA		""
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
@@ -2641,6 +2644,7 @@ enum
 #define AUTOPLAY_FFWD			(1 << 1)
 #define AUTOPLAY_WARP			(1 << 2)
 #define AUTOPLAY_TEST			(1 << 3)
+#define AUTOPLAY_FIX			(1 << 4)
 #define AUTOPLAY_WARP_NO_DISPLAY	AUTOPLAY_TEST
 
 #define AUTOPLAY_MODE_NONE		0
@@ -2648,6 +2652,7 @@ enum
 #define AUTOPLAY_MODE_FFWD		(AUTOPLAY_MODE_PLAY | AUTOPLAY_FFWD)
 #define AUTOPLAY_MODE_WARP		(AUTOPLAY_MODE_FFWD | AUTOPLAY_WARP)
 #define AUTOPLAY_MODE_TEST		(AUTOPLAY_MODE_WARP | AUTOPLAY_TEST)
+#define AUTOPLAY_MODE_FIX		(AUTOPLAY_MODE_TEST | AUTOPLAY_FIX)
 #define AUTOPLAY_MODE_WARP_NO_DISPLAY	AUTOPLAY_MODE_TEST
 
 
@@ -3637,8 +3642,6 @@ extern int			game_status;
 extern boolean			game_status_last_screen;
 extern boolean			level_editor_test_game;
 extern boolean			network_playing;
-extern boolean			network_server;
-extern SDL_Thread	       *server_thread;
 
 extern int			key_joystick_mapping;