fixed bug with undefined element graphic when pushing into explosion

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index 541787c052976539b76023aa02290eacc1f284fd..fbfb601af898908d12a8b5d1f2ee7ae255e7c5e5 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -4248,6 +4248,9 @@ static void DrawPlayerExt(struct PlayerInfo *player, int drawing_stage)
     if (!player->is_pushing || !player->is_moving)
       return;
 
+    if (Tile[next_jx][next_jy] == EL_EXPLOSION)
+      return;
+
     int gfx_frame = GfxFrame[jx][jy];
 
     if (!IS_MOVING(jx, jy))            // push movement already finished
@@ -4269,13 +4272,9 @@ static void DrawPlayerExt(struct PlayerInfo *player, int drawing_stage)
        DrawLevelElement(jx, jy, Back[jx][jy]);
       else
        DrawLevelElement(jx, jy, EL_EMPTY);
-
-      if (Back[next_jx][next_jy])
-       DrawLevelElement(next_jx, next_jy, Back[next_jx][next_jy]);
-      else
-       DrawLevelElement(next_jx, next_jy, EL_EMPTY);
     }
-    else if (Back[next_jx][next_jy])
+
+    if (Back[next_jx][next_jy])
       DrawLevelElement(next_jx, next_jy, Back[next_jx][next_jy]);
     else
       DrawLevelElement(next_jx, next_jy, EL_EMPTY);