X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=c98b7d2f4d32259af56c0fe6a5e5df8aa2e94894;hb=ed8c1829a0a5eac5e46efe0e8202b570f75fd0c6;hp=1ed645e206ae8b9883d7eaede991823e89af04c3;hpb=c56a469fbdd802f49ec27521a9a180f8db98fd5e;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 1ed645e2..c98b7d2f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -898,6 +898,17 @@
 					 (e) == EL_PEARL          ? EL_BOMB    :    \
 					 (e) == EL_CRYSTAL        ? EL_CRYSTAL :    \
 					 EL_ROCK)
+
+#define IS_BD_PLAYER_ELEMENT(e)		((e) == EL_BD_INBOX ||			\
+					 (e) == EL_BD_PLAYER ||			\
+					 (e) == EL_BD_PLAYER_WITH_BOMB ||	\
+					 (e) == EL_BD_PLAYER_GLUED ||		\
+					 (e) == EL_BD_PLAYER_STIRRING)
+
+#define IS_SOKOBAN_OBJECT_OR_FIELD(e)	((e) == EL_SOKOBAN_OBJECT ||		\
+					 (e) == EL_SOKOBAN_FIELD_EMPTY ||	\
+					 (e) == EL_SOKOBAN_FIELD_FULL)
+
 #define IS_DRAWABLE(e)			((e) < EL_BLOCKED)
 #define IS_NOT_DRAWABLE(e)		((e) >= EL_BLOCKED)
 #define TAPE_IS_EMPTY(x)		((x).length == 0)
@@ -1060,7 +1071,7 @@
 #define SC_PEARL				12
 #define SC_SHIELD				13
 #define SC_ELEM_BONUS				14
-#define SC_UNKNOWN_15				15
+#define SC_DIAMOND_EXTRA			15
 
 #define LEVEL_SCORE_ELEMENTS			16	// level elements with score
 
@@ -1993,7 +2004,8 @@
 #define EL_DF_END_2				EL_DF_SLOPE_END
 
 // BD style elements
-#define EL_BD_PLAYER				1253
+#define EL_BD_EMPTY_SPACE			1253
+#define EL_BD_EMPTY				EL_BD_EMPTY_SPACE
 #define EL_BD_SAND				1254
 #define EL_BD_SAND_2				1255
 #define EL_BD_SAND_BALL				1256
@@ -2120,13 +2132,14 @@
 #define EL_BD_DRAGONFLY_DOWN			1377
 #define EL_BD_BOMB				1378
 #define EL_BD_NITRO_PACK			1379
-#define EL_BD_PLAYER_WITH_BOMB			1380
-#define EL_BD_PLAYER_GLUED			1381
-#define EL_BD_PLAYER_STIRRING			1382
-#define EL_BD_FAKE_BONUS			1383
-#define EL_BD_COVERED				1384
+#define EL_BD_PLAYER				1380
+#define EL_BD_PLAYER_WITH_BOMB			1381
+#define EL_BD_PLAYER_GLUED			1382
+#define EL_BD_PLAYER_STIRRING			1383
+#define EL_BD_FAKE_BONUS			1384
+#define EL_BD_COVERED				1385
 
-#define NUM_FILE_ELEMENTS			1385
+#define NUM_FILE_ELEMENTS			1386
 
 
 // "real" (and therefore drawable) runtime elements
@@ -2292,9 +2305,10 @@
 #define EL_GRAPHIC_6				(EL_FIRST_DUMMY + 34)
 #define EL_GRAPHIC_7				(EL_FIRST_DUMMY + 35)
 #define EL_GRAPHIC_8				(EL_FIRST_DUMMY + 36)
+#define EL_BD_GAME_GRAPHICS_COLOR_TEMPLATE	(EL_FIRST_DUMMY + 37)
 
 // internal elements (only used for internal purposes like copying)
-#define EL_FIRST_INTERNAL			(EL_FIRST_DUMMY + 37)
+#define EL_FIRST_INTERNAL			(EL_FIRST_DUMMY + 38)
 
 #define EL_INTERNAL_CLIPBOARD_CUSTOM		(EL_FIRST_INTERNAL + 0)
 #define EL_INTERNAL_CLIPBOARD_CHANGE		(EL_FIRST_INTERNAL + 1)
@@ -3466,6 +3480,8 @@ struct LevelInfo
   int initial_inventory_size[MAX_PLAYERS];
   int initial_inventory_content[MAX_PLAYERS][MAX_INITIAL_INVENTORY_SIZE];
 
+  boolean bd_intermission;		// BD level is intermission
+  boolean bd_diagonal_movements;	// BD style diagonal movements
   boolean em_slippery_gems;		// EM style "gems slip from wall" behaviour
   boolean em_explodes_by_fire;		// EM style chain explosion behaviour
   boolean use_spring_bug;		// for compatibility with old levels