added waiting for finished snapping when snapping envelope

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index 23fe5f91eae8572a6dc463d56e2392806bf28970..be192e4fecda551a84af7b27346773c0571ae37c 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -12173,6 +12173,9 @@ void GameActions_RND(void)
        TEST_DrawLevelField(x, y);
 
        TestFieldAfterSnapping(x, y, element, move_direction, player_index_bit);
+
+       if (IS_ENVELOPE(element))
+         local_player->show_envelope = element;
       }
     }
 
@@ -14330,7 +14333,10 @@ static int DigField(struct PlayerInfo *player,
     }
     else if (IS_ENVELOPE(element))
     {
-      player->show_envelope = element;
+      boolean wait_for_snapping = (mode == DF_SNAP && level.block_snap_field);
+
+      if (!wait_for_snapping)
+       player->show_envelope = element;
     }
     else if (element == EL_EMC_LENSES)
     {