X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=7496d0e08d361623b10304508097e0dd21238ea8;hb=f7e9f2d30ab1cb38b2adef4898fdaf2d254af65b;hp=467603a896db9d65bcd5dd2e4875e11c0f8ccf79;hpb=0cb7e467765fe1ac2797cb58c069fcca56d43877;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 467603a8..7496d0e0 100644
--- a/src/game.c
+++ b/src/game.c
@@ -114,8 +114,11 @@
 	((e) == EL_TRIGGER_ELEMENT ? (ch)->actual_trigger_element :	\
 	 (e) == EL_TRIGGER_PLAYER  ? (ch)->actual_trigger_player : (e))
 
+#define GET_VALID_PLAYER_ELEMENT(e)					\
+	((e) >= EL_PLAYER_1 && (e) <= EL_PLAYER_4 ? (e) : EL_PLAYER_1)
+
 #define CAN_GROW_INTO(e)						\
-	(e == EL_SAND || (IS_DIGGABLE(e) && level.grow_into_diggable))
+	((e) == EL_SAND || (IS_DIGGABLE(e) && level.grow_into_diggable))
 
 #define ELEMENT_CAN_ENTER_FIELD_BASE_X(x, y, condition)			\
 		(IN_LEV_FIELD(x, y) && (IS_FREE(x, y) ||		\
@@ -2818,7 +2821,11 @@ void DrawRelocatePlayer(struct PlayerInfo *player)
 
 void RelocatePlayer(int jx, int jy, int el_player_raw)
 {
+#if 1
+  int el_player = GET_VALID_PLAYER_ELEMENT(el_player_raw);
+#else
   int el_player = (el_player_raw == EL_SP_MURPHY ? EL_PLAYER_1 :el_player_raw);
+#endif
   struct PlayerInfo *player = &stored_player[el_player - EL_PLAYER_1];
   boolean ffwd_delay = (tape.playing && tape.fast_forward);
   boolean no_delay = (tape.warp_forward);
@@ -3052,10 +3059,17 @@ void Explode(int ex, int ey, int phase, int mode)
 	continue;
 #else
       /* indestructible elements can only explode in center (but not flames) */
+#if 1
+      if ((IS_EXPLOSION_PROOF(element) && (x != ex || y != ey ||
+					   mode == EX_TYPE_BORDER)) ||
+	  element == EL_FLAMES)
+	continue;
+#else
       if ((IS_EXPLOSION_PROOF(element) && (x != ex || y != ey)) ||
 	  element == EL_FLAMES)
 	continue;
 #endif
+#endif
 
 #else
       if ((IS_INDESTRUCTIBLE(element) &&
@@ -3068,7 +3082,7 @@ void Explode(int ex, int ey, int phase, int mode)
 #if 1
       if (IS_PLAYER(x, y) && SHIELD_ON(PLAYERINFO(x, y)) &&
 	  (game.engine_version < VERSION_IDENT(3,1,0,0) ||
-	   (x == ex && y == ey)))
+	   (x == ex && y == ey && mode != EX_TYPE_BORDER)))
 #else
       if (IS_PLAYER(x, y) && SHIELD_ON(PLAYERINFO(x, y)))
 #endif
@@ -3083,6 +3097,12 @@ void Explode(int ex, int ey, int phase, int mode)
 	  Feld[x][y] = (Store[x][y] ? Store[x][y] : EL_EMPTY);
 	  Store[x][y] = 0;
 #endif
+
+#if 0
+	printf("::: %d,%d: %d %s [%d, %d]\n", x, y, Feld[x][y],
+	       element_info[Feld[x][y]].token_name,
+	       Store[x][y], Store2[x][y]);
+#endif
 	}
 
 	continue;
@@ -3093,10 +3113,16 @@ void Explode(int ex, int ey, int phase, int mode)
       if (IS_INDESTRUCTIBLE(element))
 	Back[x][y] = element;
 #else
+#if 1
 #if 1
+      if (IS_WALKABLE(element) && IS_INDESTRUCTIBLE(element) &&
+	  (x != ex || y != ey || mode == EX_TYPE_BORDER))
+	Back[x][y] = element;
+#else
       if (IS_WALKABLE(element) && IS_INDESTRUCTIBLE(element) &&
 	  (x != ex || y != ey))
 	Back[x][y] = element;
+#endif
 #else
       if (IS_WALKABLE(element) && IS_INDESTRUCTIBLE(element))
 	Back[x][y] = element;
@@ -3185,10 +3211,15 @@ void Explode(int ex, int ey, int phase, int mode)
       else
 	Store[x][y] = EL_EMPTY;
 
-      if (x != ex || y != ey ||
-	  center_element == EL_AMOEBA_TO_DIAMOND || mode == EX_TYPE_BORDER)
+      if (x != ex || y != ey || mode == EX_TYPE_BORDER ||
+	  center_element == EL_AMOEBA_TO_DIAMOND)
 	Store2[x][y] = element;
 
+#if 0
+      printf("::: %d,%d: %d %s\n", x, y, Store2[x][y],
+	     element_info[Store2[x][y]].token_name);
+#endif
+
 #if 0
       if (AmoebaNr[x][y] &&
 	  (element == EL_AMOEBA_FULL ||
@@ -3235,6 +3266,11 @@ void Explode(int ex, int ey, int phase, int mode)
       game.yamyam_content_nr =
 	(game.yamyam_content_nr + 1) % level.num_yamyam_contents;
 
+#if 0
+  printf("::: %d,%d: %d %s [%d]\n", ex + 1, ey, Feld[ex + 1][ey],
+	 element_info[Feld[ex + 1][ey]].token_name, Store2[ex + 1][ey]);
+#endif
+
     return;
   }
 
@@ -3288,6 +3324,11 @@ void Explode(int ex, int ey, int phase, int mode)
     border_element = StorePlayer[x][y];
 #endif
 
+#if 0
+  printf("::: %d,%d: %d %s [%d]\n", x, y, border_element,
+	 element_info[border_element].token_name, Store2[x][y]);
+#endif
+
 #if 0
   printf("::: phase == %d\n", phase);
 #endif
@@ -3318,6 +3359,11 @@ void Explode(int ex, int ey, int phase, int mode)
     }
     else if (CAN_EXPLODE_BY_EXPLOSION(border_element))
     {
+#if 0
+      printf("::: %d,%d: %d %s\n", x, y, border_element,
+	     element_info[border_element].token_name);
+#endif
+
       Feld[x][y] = Store2[x][y];
       Store2[x][y] = 0;
       Bang(x, y);
@@ -9077,7 +9123,9 @@ static boolean canMoveToValidFieldWithGravity(int x, int y, int move_dir)
 #if 1
   return (IN_LEV_FIELD(newx, newy) && !IS_FREE_OR_PLAYER(newx, newy) &&
 	  IS_GRAVITY_REACHABLE(Feld[newx][newy]) &&
+#if 0
 	  (!IS_SP_PORT(Feld[newx][newy]) || move_dir == MV_UP) &&
+#endif
 	  (IS_DIGGABLE(Feld[newx][newy]) ||
 	   IS_WALKABLE_FROM(Feld[newx][newy], opposite_dir) ||
 	   canPassField(newx, newy, move_dir)));
@@ -9769,7 +9817,11 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
       TestIfHeroTouchesBadThing(jx, jy);
       TestIfPlayerTouchesCustomElement(jx, jy);
 #if 1
-      TestIfElementTouchesCustomElement(jx, jy);	/* for empty space */
+#if 1
+      /* needed because pushed element has not yet reached its destination */
+      if (!player->is_pushing)
+#endif
+	TestIfElementTouchesCustomElement(jx, jy);	/* for empty space */
 #endif
 
       if (!player->active)