X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=e440a8ee18cce9192d0c58b9aa6904119a58c64b;hb=ad15815ec04f42779d0717a6d291f93b8e847d39;hp=4e64205b3a1ec20f734adb703f8148ef885a48aa;hpb=fb8e38bdcf517d25055b236a3bb2cc1ccbf5fccc;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 4e64205b..e440a8ee 100644
--- a/src/main.h
+++ b/src/main.h
@@ -179,11 +179,10 @@
 #define CE_LEFT_BY_PLAYER	22
 #define CE_OTHER_GETS_ENTERED	23
 #define CE_OTHER_GETS_LEFT	24
+#define CE_SWITCHED		25
+#define CE_OTHER_IS_SWITCHING	26
 
-/* values for derived change events (determined from properties above) */
-#define CE_TOUCHING_SOME_SIDE	25	/* summarized left/right/up/down/any */
-
-#define NUM_CHANGE_EVENTS	26
+#define NUM_CHANGE_EVENTS	27
 
 #define CE_BITMASK_DEFAULT	0
 
@@ -360,6 +359,9 @@
 #define PLAYER_PROTECTED(x,y)	(SHIELD_ON(PLAYERINFO(x, y)) ||		\
 				 PROTECTED_FIELD(x, y))
 
+#define PLAYER_SWITCHING(p,x,y)	((p)->Switching &&			\
+				 (p)->switch_x == (x) && (p)->switch_y == (y))
+
 #define PLAYER_NR_GFX(g,i)	((g) + i * (IMG_PLAYER_2 - IMG_PLAYER_1))
 
 #define ANIM_FRAMES(g)		(graphic_info[g].anim_frames)
@@ -819,24 +821,26 @@
 #define EL_CONVEYOR_BELT_4_RIGHT_ACTIVE	 (EL_FIRST_RUNTIME_REAL + 25)
 #define EL_EXIT_OPENING			(EL_FIRST_RUNTIME_REAL + 26)
 #define EL_EXIT_CLOSING			(EL_FIRST_RUNTIME_REAL + 27)
-#define EL_SP_EXIT_OPEN			(EL_FIRST_RUNTIME_REAL + 28)
-#define EL_SP_TERMINAL_ACTIVE		(EL_FIRST_RUNTIME_REAL + 29)
-#define EL_SP_BUGGY_BASE_ACTIVATING	(EL_FIRST_RUNTIME_REAL + 30)
-#define EL_SP_BUGGY_BASE_ACTIVE		(EL_FIRST_RUNTIME_REAL + 31)
-#define EL_SP_MURPHY_CLONE		(EL_FIRST_RUNTIME_REAL + 32)
-#define EL_AMOEBA_DROPPING		(EL_FIRST_RUNTIME_REAL + 33)
-#define EL_QUICKSAND_EMPTYING		(EL_FIRST_RUNTIME_REAL + 34)
-#define EL_MAGIC_WALL_ACTIVE		(EL_FIRST_RUNTIME_REAL + 35)
-#define EL_BD_MAGIC_WALL_ACTIVE		(EL_FIRST_RUNTIME_REAL + 36)
-#define EL_MAGIC_WALL_FULL		(EL_FIRST_RUNTIME_REAL + 37)
-#define EL_BD_MAGIC_WALL_FULL		(EL_FIRST_RUNTIME_REAL + 38)
-#define EL_MAGIC_WALL_EMPTYING		(EL_FIRST_RUNTIME_REAL + 39)
-#define EL_BD_MAGIC_WALL_EMPTYING	(EL_FIRST_RUNTIME_REAL + 40)
-#define EL_MAGIC_WALL_DEAD		(EL_FIRST_RUNTIME_REAL + 41)
-#define EL_BD_MAGIC_WALL_DEAD		(EL_FIRST_RUNTIME_REAL + 42)
+#define EL_SP_EXIT_OPENING		(EL_FIRST_RUNTIME_REAL + 28)
+#define EL_SP_EXIT_CLOSING		(EL_FIRST_RUNTIME_REAL + 29)
+#define EL_SP_EXIT_OPEN			(EL_FIRST_RUNTIME_REAL + 30)
+#define EL_SP_TERMINAL_ACTIVE		(EL_FIRST_RUNTIME_REAL + 31)
+#define EL_SP_BUGGY_BASE_ACTIVATING	(EL_FIRST_RUNTIME_REAL + 32)
+#define EL_SP_BUGGY_BASE_ACTIVE		(EL_FIRST_RUNTIME_REAL + 33)
+#define EL_SP_MURPHY_CLONE		(EL_FIRST_RUNTIME_REAL + 34)
+#define EL_AMOEBA_DROPPING		(EL_FIRST_RUNTIME_REAL + 35)
+#define EL_QUICKSAND_EMPTYING		(EL_FIRST_RUNTIME_REAL + 36)
+#define EL_MAGIC_WALL_ACTIVE		(EL_FIRST_RUNTIME_REAL + 37)
+#define EL_BD_MAGIC_WALL_ACTIVE		(EL_FIRST_RUNTIME_REAL + 38)
+#define EL_MAGIC_WALL_FULL		(EL_FIRST_RUNTIME_REAL + 39)
+#define EL_BD_MAGIC_WALL_FULL		(EL_FIRST_RUNTIME_REAL + 40)
+#define EL_MAGIC_WALL_EMPTYING		(EL_FIRST_RUNTIME_REAL + 41)
+#define EL_BD_MAGIC_WALL_EMPTYING	(EL_FIRST_RUNTIME_REAL + 42)
+#define EL_MAGIC_WALL_DEAD		(EL_FIRST_RUNTIME_REAL + 43)
+#define EL_BD_MAGIC_WALL_DEAD		(EL_FIRST_RUNTIME_REAL + 44)
 
 /* "unreal" (and therefore not drawable) runtime elements */
-#define EL_FIRST_RUNTIME_UNREAL		(EL_FIRST_RUNTIME_REAL + 43)
+#define EL_FIRST_RUNTIME_UNREAL		(EL_FIRST_RUNTIME_REAL + 45)
 
 #define EL_BLOCKED			(EL_FIRST_RUNTIME_UNREAL + 0)
 #define EL_EXPLOSION			(EL_FIRST_RUNTIME_UNREAL + 1)
@@ -1024,9 +1028,9 @@
 
 #define PROGRAM_VERSION_MAJOR	3
 #define PROGRAM_VERSION_MINOR	0
-#define PROGRAM_VERSION_PATCH	6
+#define PROGRAM_VERSION_PATCH	7
 #define PROGRAM_VERSION_RELEASE	0
-#define PROGRAM_VERSION_STRING	"3.0.6"
+#define PROGRAM_VERSION_STRING	"3.0.7"
 
 #define PROGRAM_TITLE_STRING	"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING	"Holger Schemel"
@@ -1139,6 +1143,8 @@ struct PlayerInfo
   boolean LevelSolved, GameOver;
   boolean snapped;
 
+  int switch_x, switch_y;
+
   int last_move_dir;
   boolean is_moving;
   boolean is_waiting;
@@ -1195,7 +1201,7 @@ struct LevelInfo
   int time_light;
   int time_timegate;
   boolean double_speed;
-  boolean gravity;
+  boolean initial_gravity;
   boolean em_slippery_gems;	/* EM style "gems slip from wall" behaviour */
 
   short field[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -1246,8 +1252,6 @@ struct GameInfo
   int initial_move_delay;
   int initial_move_delay_value;
 
-  boolean envelope_active;
-
   /* variable within running game */
   int yamyam_content_nr;
   boolean magic_wall_active;
@@ -1258,7 +1262,9 @@ struct GameInfo
   int belt_dir_nr[4];
   int switchgate_pos;
   int balloon_dir;
+  boolean gravity;
   boolean explosions_delayed;
+  boolean envelope_active;
 };
 
 struct GlobalInfo