#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)
#define PROGRAM_VERSION_SUPER 4
#define PROGRAM_VERSION_MAJOR 2
#define PROGRAM_VERSION_MINOR 0
-#define PROGRAM_VERSION_PATCH 3
+#define PROGRAM_VERSION_PATCH 4
#define PROGRAM_VERSION_EXTRA ""
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
#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
#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
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;