X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=0ab4907d5db570a8e3cb73b3255d77aba0f54ce9;hp=029f17434cdc6d4882c4c63c922b832eeb8c776f;hb=0896ebe9d29a756c7adc005c6b93ff28f2fd396d;hpb=b641818c787e48bbf03ce2a0cd5b542c4c21e523

diff --git a/src/main.h b/src/main.h
index 029f1743..0ab4907d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -817,13 +817,13 @@
 #if 1
 #define TILE_GFX_ELEMENT(x, y)						\
 		   (GfxElement[x][y] != EL_UNDEFINED &&			\
-		    Feld[x][y] != EL_EXPLOSION ?			\
-		    GfxElement[x][y] : Feld[x][y])
+		    Tile[x][y] != EL_EXPLOSION ?			\
+		    GfxElement[x][y] : Tile[x][y])
 #else
 #define TILE_GFX_ELEMENT(x, y)						\
 	GFX_ELEMENT(GfxElement[x][y] != EL_UNDEFINED &&			\
-		    Feld[x][y] != EL_EXPLOSION ?			\
-		    GfxElement[x][y] : Feld[x][y])
+		    Tile[x][y] != EL_EXPLOSION ?			\
+		    GfxElement[x][y] : Tile[x][y])
 #endif
 
 // !!! "use sound" deactivated due to problems with level "bug machine" !!!
@@ -844,12 +844,12 @@
 
 #define IS_PLAYER(x, y)		(ELEM_IS_PLAYER(StorePlayer[x][y]))
 
-#define IS_FREE(x, y)		(Feld[x][y] == EL_EMPTY && !IS_PLAYER(x, y))
-#define IS_FREE_OR_PLAYER(x, y)	(Feld[x][y] == EL_EMPTY)
+#define IS_FREE(x, y)		(Tile[x][y] == EL_EMPTY && !IS_PLAYER(x, y))
+#define IS_FREE_OR_PLAYER(x, y)	(Tile[x][y] == EL_EMPTY)
 
 #define IS_MOVING(x,y)		(MovPos[x][y] != 0)
 #define IS_FALLING(x,y)		(MovPos[x][y] != 0 && MovDir[x][y] == MV_DOWN)
-#define IS_BLOCKED(x,y)		(Feld[x][y] == EL_BLOCKED)
+#define IS_BLOCKED(x,y)		(Tile[x][y] == EL_BLOCKED)
 
 #define IS_MV_DIAGONAL(x)	((x) & MV_HORIZONTAL && (x) & MV_VERTICAL)
 
@@ -880,9 +880,9 @@
 #define PLAYERINFO(x,y)		(&stored_player[StorePlayer[x][y]-EL_PLAYER_1])
 #define SHIELD_ON(p)		((p)->shield_normal_time_left > 0)
 
-#define ENEMY_PROTECTED_FIELD(x,y)	(IS_PROTECTED(Feld[x][y]) ||       \
+#define ENEMY_PROTECTED_FIELD(x,y)	(IS_PROTECTED(Tile[x][y]) ||       \
 					 IS_PROTECTED(Back[x][y]))
-#define EXPLOSION_PROTECTED_FIELD(x,y)  (IS_EXPLOSION_PROOF(Feld[x][y]))
+#define EXPLOSION_PROTECTED_FIELD(x,y)  (IS_EXPLOSION_PROOF(Tile[x][y]))
 #define PLAYER_ENEMY_PROTECTED(x,y)     (SHIELD_ON(PLAYERINFO(x, y)) ||	   \
 					 ENEMY_PROTECTED_FIELD(x, y))
 #define PLAYER_EXPLOSION_PROTECTED(x,y) (SHIELD_ON(PLAYERINFO(x, y)) ||	   \
@@ -963,7 +963,7 @@
 #define MAX_ELEMENTS_IN_GROUP	16
 #define MIN_ANDROID_ELEMENTS	1
 #define MAX_ANDROID_ELEMENTS	32
-#define MAX_ANDROID_ELEMENTS_OLD 16	// (extended after version 4.1.4.1)
+#define MAX_ANDROID_ELEMENTS_OLD 16	// (extended since version 4.2.0.0)
 
 // values for elements with content
 #define MIN_ELEMENT_CONTENTS	1
@@ -2562,7 +2562,7 @@ enum
 #define PROGRAM_VERSION_SUPER		4
 #define PROGRAM_VERSION_MAJOR		2
 #define PROGRAM_VERSION_MINOR		0
-#define PROGRAM_VERSION_PATCH		2
+#define PROGRAM_VERSION_PATCH		3
 #define PROGRAM_VERSION_EXTRA		""
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
@@ -2641,6 +2641,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 +2649,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
 
 
@@ -3219,6 +3221,11 @@ struct GlobalInfo
   boolean autoplay_all;
   boolean autoplay_mode;
 
+  char *patchtapes_mode;
+  char *patchtapes_leveldir;
+  int patchtapes_level[MAX_TAPES_PER_SET];
+  boolean patchtapes_all;
+
   char *convert_leveldir;
   int convert_level_nr;
 
@@ -3632,12 +3639,10 @@ 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;
 
-extern short			Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short			Tile[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			Last[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short			MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];