rnd-20031005-1-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index e860375cdecc20ae218d6356b9fe72bbdd79864c..985014bad0090e53a9d3630cc049b2795584c605 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -179,8 +179,8 @@
 #define CE_LEFT_BY_PLAYER      22
 #define CE_OTHER_GETS_ENTERED  23
 #define CE_OTHER_GETS_LEFT     24
-#define CE_SWITCHED_BY_PLAYER  25
-#define CE_OTHER_GETS_SWITCHED 26
+#define CE_SWITCHED            25
+#define CE_OTHER_IS_SWITCHING  26
 
 #define NUM_CHANGE_EVENTS      27
 
@@ -359,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)
@@ -1138,6 +1141,8 @@ struct PlayerInfo
   boolean LevelSolved, GameOver;
   boolean snapped;
 
+  int switch_x, switch_y;
+
   int last_move_dir;
   boolean is_moving;
   boolean is_waiting;