rnd-19980817

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index 01d6b72cc2d7df39362f53fe104ae13062ed4192..eb64c053d27d23f99731ebf76662efa253c5cfa3 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -107,8 +107,8 @@ void InitGame()
       case EL_SPIELFIGUR:
       case EL_SPIELER1:
        Feld[x][y] = EL_LEERRAUM;
-       JX = x;
-       JY = y;
+       JX = lastJX = x;
+       JY = lastJY = y;
        break;
       case EL_SPIELER2:
        Feld[x][y] = EL_LEERRAUM;
@@ -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))
@@ -2715,14 +2724,6 @@ void GameActions()
        }
       }
     }
-
-    /*
-    if (PlayerMovPos)
-      ScrollFigure(0);
-
-    DrawPlayerField();
-    */
-
   }
 
   if (TimeLeft>0 && TimeFrames>=25 && !tape.pausing)
@@ -2742,33 +2743,17 @@ void GameActions()
       KillHero();
   }
 
-  /*
-  if (PlayerMovPos)
-    ScrollFigure(0);
-    */
-
-
-  /*
   DrawPlayerField();
-  */
-
-
-  DrawPlayerField();
-
 
   BackToFront();
 }
 
 void ScrollLevel(int dx, int dy)
 {
+  int softscroll_offset = (soft_scrolling_on ? TILEX : 0);
   int x,y;
-  int softscroll_offset = (FX == TILEX ? TILEX : 0);
 
-  if (soft_scrolling_on)
-  {
-    ScreenMovPos = PlayerMovPos;
-    redraw_mask |= REDRAW_FIELD;
-  }
+  ScreenMovPos = PlayerMovPos;
 
   XCopyArea(display,drawto_field,drawto_field,gc,
            FX + TILEX*(dx==-1) - softscroll_offset,
@@ -2800,10 +2785,6 @@ BOOL MoveFigureOneStep(int dx, int dy, int real_dx, int real_dy)
   int element;
   int can_move;
 
-/*
-  int old_move_dir = PlayerMovDir;
-*/
-
   if (PlayerGone || (!dx && !dy))
     return(MF_NO_ACTION);
 
@@ -2811,12 +2792,6 @@ BOOL MoveFigureOneStep(int dx, int dy, int real_dx, int real_dy)
                  dx > 0 ? MV_RIGHT :
                  dy < 0 ? MV_UP :
                  dy > 0 ? MV_DOWN :    MV_NO_MOVING);
-/*
-  if (old_move_dir != PlayerMovDir)
-    PlayerFrame = 0;
-  else
-    PlayerFrame = (PlayerFrame + 1) % 4;
-*/
 
   if (!IN_LEV_FIELD(newJX,newJY))
     return(MF_NO_ACTION);
@@ -2850,8 +2825,8 @@ BOOL MoveFigureOneStep(int dx, int dy, int real_dx, int real_dy)
   JY = newJY;
 
 
-  JX2 = oldJX;
-  JY2 = oldJY;
+  lastJX = oldJX;
+  lastJY = oldJY;
 
   PlayerMovPos = (dx > 0 || dy > 0 ? -1 : 1) * 3*TILEX/4;
 
@@ -2881,21 +2856,6 @@ BOOL MoveFigure(int dx, int dy)
   if (PlayerGone || (!dx && !dy))
     return(FALSE);
 
-/*
-  if (!DelayReached(&move_delay,8) && !tape.playing)
-    return(FALSE);
-*/
-
-/*
-  if (!DelayReached(&move_delay,10) && !tape.playing)
-    return(FALSE);
-*/
-
-/*
-  if (!FrameReached(&move_delay,2) && !tape.playing)
-    return(FALSE);
-*/
-
   if (Movemethod == 0)
   {
     if (!DelayReached(&move_delay,Movespeed[0]) && !tape.playing)
@@ -2907,7 +2867,6 @@ BOOL MoveFigure(int dx, int dy)
       return(FALSE);
   }
 
-
   if (last_move_dir & (MV_LEFT | MV_RIGHT))
   {
     if (!(moved |= MoveFigureOneStep(0,dy, dx,dy)))
@@ -2921,17 +2880,6 @@ BOOL MoveFigure(int dx, int dy)
 
   last_move_dir = MV_NO_MOVING;
 
-
-  /*
-  if (moved |= MoveFigureOneStep(dx,0, dx,dy))
-    moved |= MoveFigureOneStep(0,dy, dx,dy);
-  else
-  {
-    moved |= MoveFigureOneStep(0,dy, dx,dy);
-    moved |= MoveFigureOneStep(dx,0, dx,dy);
-  }
-  */
-
   if (moved & MF_MOVING)
   {
     int old_scroll_x=scroll_x, old_scroll_y=scroll_y;
@@ -2967,10 +2915,6 @@ BOOL MoveFigure(int dx, int dy)
 
   TestIfHeroHitsBadThing();
 
-  /*
-  BackToFront();
-  */
-
   if (PlayerGone)
     RemoveHero();
 
@@ -2980,30 +2924,32 @@ BOOL MoveFigure(int dx, int dy)
 void ScrollFigure(int init)
 {
   static long actual_frame_counter;
-  static int oldX = -1, oldY = -1;
+  static int oldJX = -1, oldJY = -1;
 
   if (init)
   {
-    if (PlayerMovPos && oldX != -1 && oldY != -1)
-    {
-      if (Feld[JX2][JY2] == EL_LEERRAUM)
-       Feld[JX2][JY2] = EL_UNSICHTBAR;
-      DrawLevelElement(oldX,oldY, Feld[oldX][oldY]);
-      DrawPlayerField();
-    }
+    if (oldJX != -1 && oldJY != -1)
+      DrawLevelElement(oldJX,oldJY, Feld[oldJX][oldJY]);
+
+    if (Feld[lastJX][lastJY] == EL_LEERRAUM)
+      Feld[lastJX][lastJY] = EL_PLAYER_IS_LEAVING;
+    DrawLevelElement(lastJX,lastJY, Feld[lastJX][lastJY]);
+    DrawPlayerField();
 
-    oldX = JX2;
-    oldY = JY2;
+    oldJX = lastJX;
+    oldJY = lastJY;
     actual_frame_counter = FrameCounter;
 
-    /*
-    redraw[redraw_x1 + oldX][redraw_y1 + oldY] = 1;
-    redraw_tiles++;
-    */
+    if (PlayerPushing)
+    {
+      int nextJX = JX + (JX - lastJX);
+      int nextJY = JY + (JY - lastJY);
 
-    /*
-    DrawLevelElement(oldX,oldY, Feld[oldX][oldY]);
-    */
+      if (Feld[nextJX][nextJY] == EL_SOKOBAN_FELD_VOLL)
+       DrawLevelElement(nextJX,nextJY, EL_SOKOBAN_FELD_LEER);
+      else
+       DrawLevelElement(nextJX,nextJY, EL_LEERRAUM);
+    }
 
     DrawPlayerField();
 
@@ -3020,16 +2966,47 @@ void ScrollFigure(int init)
     redraw_mask |= REDRAW_FIELD;
   }
 
-  if (Feld[oldX][oldY] == EL_UNSICHTBAR)
-    Feld[oldX][oldY] = EL_LEERRAUM;
+  if (Feld[oldJX][oldJY] == EL_PLAYER_IS_LEAVING)
+    Feld[oldJX][oldJY] = EL_LEERRAUM;
 
-  DrawLevelElement(oldX,oldY, Feld[oldX][oldY]);
+  DrawLevelElement(oldJX,oldJY, Feld[oldJX][oldJY]);
   DrawPlayerField();
 
+
+
+  if (Store[oldJX][oldJY])
+  {
+    DrawGraphic(SCROLLX(oldJX),SCROLLY(oldJY),el2gfx(Store[oldJX][oldJY]));
+    DrawGraphicThruMask(SCROLLX(oldJX),SCROLLY(oldJY),
+                       el2gfx(Feld[oldJX][oldJY]));
+  }
+  else if (Feld[oldJX][oldJY]==EL_DYNAMIT)
+    DrawDynamite(oldJX,oldJY);
+  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)
   {
-    JX2 = JX;
-    JY2 = JY;
+    lastJX = JX;
+    lastJY = JY;
+
+    oldJX = oldJY = -1;
   }
 }
 
@@ -3221,7 +3198,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)
   {
@@ -3539,7 +3517,7 @@ BOOL PlaceBomb(void)
 {
   int element;
 
-  if (PlayerGone)
+  if (PlayerGone || PlayerMovPos)
     return(FALSE);
 
   element = Feld[JX][JY];