From: Holger Schemel <info@artsoft.org>
Date: Sat, 20 May 2023 23:22:10 +0000 (+0200)
Subject: fixed bug with triggering "entered by player" event when pushing element
X-Git-Tag: 4.3.6.0~1
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=968784645110934cf7829da7b2951423a63c93c3;p=rocksndiamonds.git

fixed bug with triggering "entered by player" event when pushing element
---

diff --git a/src/game.c b/src/game.c
index a6287f2e..56f36518 100644
--- a/src/game.c
+++ b/src/game.c
@@ -13227,13 +13227,18 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
 					  CE_PLAYER_LEAVES_X,
 					  player->index_bit, leave_side);
 
-      if (IS_CUSTOM_ELEMENT(new_element))
-	CheckElementChangeByPlayer(jx, jy, new_element, CE_ENTERED_BY_PLAYER,
-				   player->index_bit, enter_side);
+      // needed because pushed element has not yet reached its destination,
+      // so it would trigger a change event at its previous field location
+      if (!player->is_pushing)
+      {
+	if (IS_CUSTOM_ELEMENT(new_element))
+	  CheckElementChangeByPlayer(jx, jy, new_element, CE_ENTERED_BY_PLAYER,
+				     player->index_bit, enter_side);
 
-      CheckTriggeredElementChangeByPlayer(jx, jy, new_element,
-					  CE_PLAYER_ENTERS_X,
-					  player->index_bit, enter_side);
+	CheckTriggeredElementChangeByPlayer(jx, jy, new_element,
+					    CE_PLAYER_ENTERS_X,
+					    player->index_bit, enter_side);
+      }
 
       CheckTriggeredElementChangeBySide(jx, jy, player->initial_element,
 					CE_MOVE_OF_X, move_direction);
@@ -13244,8 +13249,8 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
       TestIfPlayerTouchesBadThing(jx, jy);
       TestIfPlayerTouchesCustomElement(jx, jy);
 
-      /* needed because pushed element has not yet reached its destination,
-	 so it would trigger a change event at its previous field location */
+      // needed because pushed element has not yet reached its destination,
+      // so it would trigger a change event at its previous field location
       if (!player->is_pushing)
 	TestIfElementTouchesCustomElement(jx, jy);	// for empty space