From: Holger Schemel <info@artsoft.org>
Date: Fri, 14 Aug 1998 09:59:21 +0000 (+0200)
Subject: rnd-19980814
X-Git-Tag: 1.2.0^2~95
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=898bbdbe51b5212cd25588c04c3a6a771fbc79f6;p=rocksndiamonds.git

rnd-19980814
---

diff --git a/src/game.c b/src/game.c
index 521cc1a8..f70257ed 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1392,6 +1392,15 @@ void StartMoving(int x, int y)
 
   if (CAN_FALL(element) && y<lev_fieldy-1)
   {
+    if (PlayerPushing && PlayerMovPos)
+    {
+      int nextJX = JX + (JX - lastJX);
+      int nextJY = JY + (JY - lastJY);
+
+      if (x == nextJX && y == nextJY)
+	return;
+    }
+
     if (element==EL_MORAST_VOLL)
     {
       if (IS_FREE(x,y+1))
@@ -3035,6 +3044,19 @@ void ScrollFigure(int init)
     DrawLevelElement(oldJX,oldJY, Feld[oldJX][oldJY]);
     */
 
+
+    if (PlayerPushing)
+    {
+      int nextJX = JX + (JX - lastJX);
+      int nextJY = JY + (JY - lastJY);
+
+      if (Feld[nextJX][nextJY] == EL_SOKOBAN_FELD_VOLL)
+	DrawLevelElement(nextJX,nextJY, EL_SOKOBAN_FELD_LEER);
+      else
+	DrawLevelElement(nextJX,nextJY, EL_LEERRAUM);
+  }
+
+
     DrawPlayerField();
 
     return;
@@ -3069,7 +3091,21 @@ void ScrollFigure(int init)
   else
     DrawLevelField(oldJX,oldJY);
 
+  if (PlayerPushing)
+  {
+    int nextJX = JX + (JX - lastJX);
+    int nextJY = JY + (JY - lastJY);
 
+    if (PlayerMovPos)
+    {
+      if (Feld[nextJX][nextJY] == EL_SOKOBAN_FELD_VOLL)
+	DrawLevelElement(nextJX,nextJY, EL_SOKOBAN_FELD_LEER);
+      else
+	DrawLevelElement(nextJX,nextJY, EL_LEERRAUM);
+    }
+    else
+      DrawLevelElement(nextJX,nextJY, Feld[nextJX][nextJY]);
+  }
 
   if (!PlayerMovPos)
   {
@@ -3268,7 +3304,8 @@ int DigField(int x, int y, int real_dx, int real_dy, int mode)
   static long push_delay = 0;
   static int push_delay_value = 5;
 
-  PlayerPushing = FALSE;
+  if (!PlayerMovPos)
+    PlayerPushing = FALSE;
 
   if (mode == DF_NO_PUSH)
   {
diff --git a/src/tools.c b/src/tools.c
index 8dd25fcf..85c9009f 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -507,6 +507,26 @@ void DrawPlayerField()
     */
 
 
+
+  if (PlayerPushing && PlayerMovPos)
+  {
+    int nextJX = JX + (JX - lastJX);
+    int nextJY = JY + (JY - lastJY);
+    int px = SCROLLX(nextJX), py = SCROLLY(nextJY);
+
+    if (Feld[JX][JY] == EL_SOKOBAN_FELD_LEER ||
+	Feld[nextJX][nextJY] == EL_SOKOBAN_FELD_VOLL)
+      DrawGraphicShiftedThruMask(px,py,sxx,syy,
+				 GFX_SOKOBAN_OBJEKT,
+				 CUT_NO_CUTTING);
+    else
+      DrawGraphicShifted(px,py,sxx,syy,
+			 el2gfx(Feld[nextJX][nextJY]),
+			 CUT_NO_CUTTING);
+  }
+
+
+
   /* draw things in front of player (EL_DYNAMIT || EL_DYNABOMB) */
 
   if (element == EL_DYNAMIT || element == EL_DYNABOMB)