X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=820d3c5bf6d8aa379fdd5b07a20ecaf2911e381c;hb=2d235297197dd0c325184f7fc401d9c5c41c2616;hp=4b22fe907624a0ab574530503fe3d54322b7db36;hpb=d4758d12db28cd36edca33c9c7ab05476a8f85e7;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 4b22fe90..820d3c5b 100644
--- a/src/main.h
+++ b/src/main.h
@@ -985,27 +985,29 @@
 #define EL_EMC_ANDROID			680
 #define EL_EMC_GRASS			681
 #define EL_EMC_MAGIC_BALL		682
-#define EL_EMC_MAGIC_BALL_SWITCH	683
-#define EL_EMC_SPRING_BUMPER		684
-#define EL_EMC_PLANT			685
-#define EL_EMC_LENSES			686
-#define EL_EMC_MAGNIFIER		687
-#define EL_EMC_WALL_9			688
-#define EL_EMC_WALL_10			689
-#define EL_EMC_WALL_11			690
-#define EL_EMC_WALL_12			691
-#define EL_EMC_WALL_13			692
-#define EL_EMC_WALL_14			693
-#define EL_EMC_WALL_15			694
-#define EL_EMC_WALL_16			695
-#define EL_EMC_WALL_SLIPPERY_1		696
-#define EL_EMC_WALL_SLIPPERY_2		697
-#define EL_EMC_WALL_SLIPPERY_3		698
-#define EL_EMC_WALL_SLIPPERY_4		699
-#define EL_EMC_FAKE_GRASS		700
-#define EL_EMC_DRIPPER			701
-
-#define NUM_FILE_ELEMENTS		702
+#define EL_EMC_MAGIC_BALL_ACTIVE	683
+#define EL_EMC_MAGIC_BALL_SWITCH	684
+#define EL_EMC_MAGIC_BALL_SWITCH_ACTIVE	685
+#define EL_EMC_SPRING_BUMPER		686
+#define EL_EMC_PLANT			687
+#define EL_EMC_LENSES			688
+#define EL_EMC_MAGNIFIER		689
+#define EL_EMC_WALL_9			690
+#define EL_EMC_WALL_10			691
+#define EL_EMC_WALL_11			692
+#define EL_EMC_WALL_12			693
+#define EL_EMC_WALL_13			694
+#define EL_EMC_WALL_14			695
+#define EL_EMC_WALL_15			696
+#define EL_EMC_WALL_16			697
+#define EL_EMC_WALL_SLIPPERY_1		698
+#define EL_EMC_WALL_SLIPPERY_2		699
+#define EL_EMC_WALL_SLIPPERY_3		700
+#define EL_EMC_WALL_SLIPPERY_4		701
+#define EL_EMC_FAKE_GRASS		702
+#define EL_EMC_DRIPPER			703
+
+#define NUM_FILE_ELEMENTS		704
 
 
 /* "real" (and therefore drawable) runtime elements */
@@ -1216,30 +1218,31 @@
 #define GFX_ARG_2ND_OFFSET		12
 #define GFX_ARG_2ND_XOFFSET		13
 #define GFX_ARG_2ND_YOFFSET		14
-#define GFX_ARG_FRAMES			15
-#define GFX_ARG_FRAMES_PER_LINE		16
-#define GFX_ARG_START_FRAME		17
-#define GFX_ARG_DELAY			18
-#define GFX_ARG_ANIM_MODE		19
-#define GFX_ARG_GLOBAL_SYNC		20
-#define GFX_ARG_CRUMBLED_LIKE		21
-#define GFX_ARG_DIGGABLE_LIKE		22
-#define GFX_ARG_BORDER_SIZE		23
-#define GFX_ARG_STEP_OFFSET		24
-#define GFX_ARG_STEP_DELAY		25
-#define GFX_ARG_DIRECTION		26
-#define GFX_ARG_POSITION		27
-#define GFX_ARG_DRAW_XOFFSET		28
-#define GFX_ARG_DRAW_YOFFSET		29
-#define GFX_ARG_DRAW_MASKED		30
-#define GFX_ARG_ANIM_DELAY_FIXED	31
-#define GFX_ARG_ANIM_DELAY_RANDOM	32
-#define GFX_ARG_POST_DELAY_FIXED	33
-#define GFX_ARG_POST_DELAY_RANDOM	34
-#define GFX_ARG_NAME			35
-#define GFX_ARG_SCALE_UP_FACTOR		36
-
-#define NUM_GFX_ARGS			37
+#define GFX_ARG_2ND_SWAP_TILES		15	
+#define GFX_ARG_FRAMES			16
+#define GFX_ARG_FRAMES_PER_LINE		17
+#define GFX_ARG_START_FRAME		18
+#define GFX_ARG_DELAY			19
+#define GFX_ARG_ANIM_MODE		20
+#define GFX_ARG_GLOBAL_SYNC		21
+#define GFX_ARG_CRUMBLED_LIKE		22
+#define GFX_ARG_DIGGABLE_LIKE		23
+#define GFX_ARG_BORDER_SIZE		24
+#define GFX_ARG_STEP_OFFSET		25
+#define GFX_ARG_STEP_DELAY		26
+#define GFX_ARG_DIRECTION		27
+#define GFX_ARG_POSITION		28
+#define GFX_ARG_DRAW_XOFFSET		29
+#define GFX_ARG_DRAW_YOFFSET		30
+#define GFX_ARG_DRAW_MASKED		31
+#define GFX_ARG_ANIM_DELAY_FIXED	32
+#define GFX_ARG_ANIM_DELAY_RANDOM	33
+#define GFX_ARG_POST_DELAY_FIXED	34
+#define GFX_ARG_POST_DELAY_RANDOM	35
+#define GFX_ARG_NAME			36
+#define GFX_ARG_SCALE_UP_FACTOR		37
+
+#define NUM_GFX_ARGS			38
 
 
 /* values for sound configuration suffixes */
@@ -1323,9 +1326,9 @@
 /* program information and versioning definitions */
 
 #define PROGRAM_VERSION_MAJOR		3
-#define PROGRAM_VERSION_MINOR		1
-#define PROGRAM_VERSION_PATCH		1
-#define PROGRAM_VERSION_BUILD		0
+#define PROGRAM_VERSION_MINOR		2
+#define PROGRAM_VERSION_PATCH		0
+#define PROGRAM_VERSION_BUILD		1
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING		"Holger Schemel"
@@ -1904,6 +1907,7 @@ struct GraphicInfo
   int offset_x, offset_y;	/* x/y offset to next animation frame */
   int offset2_x, offset2_y;	/* x/y offset to second movement tile */
   boolean double_movement;	/* animation has second movement tile */
+  int swap_double_tiles;	/* explicitely force or forbid tile swapping */
   int anim_frames;
   int anim_frames_per_line;
   int anim_start_frame;