rnd-19980813-1

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index 15c379531fc488fc94a14f84cc5b0c02b7d6cc5e..01d6b72cc2d7df39362f53fe104ae13062ed4192 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -49,6 +49,7 @@ void GetPlayerConfig()
   joystick_nr = SETUP_2ND_JOYSTICK_ON(player.setup);
   quick_doors = SETUP_QUICK_DOORS_ON(player.setup);
   scroll_delay_on = SETUP_SCROLL_DELAY_ON(player.setup);
+  soft_scrolling_on = SETUP_SOFT_SCROLL_ON(player.setup);
 
   if (joystick_nr != old_joystick_nr)
   {
@@ -74,7 +75,9 @@ void InitGame()
   FrameCounter = 0;
   TimeFrames = 0;
   TimeLeft = level.time;
+  ScreenMovPos = 0;
   PlayerMovDir = MV_NO_MOVING;
+  PlayerMovPos = 0;
   PlayerFrame = 0;
   PlayerPushing = FALSE;
   PlayerGone = LevelSolved = GameOver = SiebAktiv = FALSE;
@@ -2386,7 +2389,7 @@ void EdelsteinFunkeln(int x, int y)
       MovDelay[x][y]--;
 
       if (direct_draw_on && MovDelay[x][y])
-       drawto_field = backbuffer;
+       SetDrawtoField(DRAW_BUFFERED);
 
       DrawGraphic(SCROLLX(x),SCROLLY(y), el2gfx(Feld[x][y]));
 
@@ -2397,8 +2400,8 @@ void EdelsteinFunkeln(int x, int y)
 
        src_x  = SX+GFX_PER_LINE*TILEX;
        src_y  = SY+(phase > 2 ? 4-phase : phase)*TILEY;
-       dest_x = SX+SCROLLX(x)*TILEX;
-       dest_y = SY+SCROLLY(y)*TILEY;
+       dest_x = FX+SCROLLX(x)*TILEX;
+       dest_y = FY+SCROLLY(y)*TILEY;
 
        XSetClipOrigin(display,clip_gc[PIX_BACK],dest_x-src_x,dest_y-src_y);
        XCopyArea(display,pix[PIX_BACK],drawto_field,clip_gc[PIX_BACK],
@@ -2406,9 +2409,9 @@ void EdelsteinFunkeln(int x, int y)
 
        if (direct_draw_on)
        {
-         XCopyArea(display,backbuffer,window,gc,
+         XCopyArea(display,drawto_field,window,gc,
                    dest_x,dest_y, TILEX,TILEY, dest_x,dest_y);
-         drawto_field = window;
+         SetDrawtoField(DRAW_DIRECT);
        }
       }
     }
@@ -2564,7 +2567,23 @@ void GameActions()
   action_delay_value =
     (tape.playing && tape.fast_forward ? FFWD_FRAME_DELAY : Gamespeed);
 
+  /*
   if (DelayReached(&action_delay, action_delay_value))
+  */
+
+
+
+  if (PlayerMovPos)
+    ScrollFigure(0);
+
+  DrawPlayerField();
+
+
+
+
+  if (!DelayReached(&action_delay, action_delay_value))
+    return;
+
   {
     int x,y,element;
     int sieb_x = 0, sieb_y = 0;
@@ -2696,6 +2715,14 @@ void GameActions()
        }
       }
     }
+
+    /*
+    if (PlayerMovPos)
+      ScrollFigure(0);
+
+    DrawPlayerField();
+    */
+
   }
 
   if (TimeLeft>0 && TimeFrames>=25 && !tape.pausing)
@@ -2715,32 +2742,56 @@ void GameActions()
       KillHero();
   }
 
+  /*
+  if (PlayerMovPos)
+    ScrollFigure(0);
+    */
+
+
+  /*
+  DrawPlayerField();
+  */
+
+
+  DrawPlayerField();
+
+
   BackToFront();
 }
 
 void ScrollLevel(int dx, int dy)
 {
   int x,y;
+  int softscroll_offset = (FX == TILEX ? TILEX : 0);
+
+  if (soft_scrolling_on)
+  {
+    ScreenMovPos = PlayerMovPos;
+    redraw_mask |= REDRAW_FIELD;
+  }
 
   XCopyArea(display,drawto_field,drawto_field,gc,
-           SX+TILEX*(dx==-1),SY+TILEY*(dy==-1),
-           SXSIZE-TILEX*(dx!=0),SYSIZE-TILEY*(dy!=0),
-           SX+TILEX*(dx==1),SY+TILEY*(dy==1));
+           FX + TILEX*(dx==-1) - softscroll_offset,
+           FY + TILEY*(dy==-1) - softscroll_offset,
+           SXSIZE - TILEX*(dx!=0) + 2*softscroll_offset,
+           SYSIZE - TILEY*(dy!=0) + 2*softscroll_offset,
+           FX + TILEX*(dx==1) - softscroll_offset,
+           FY + TILEY*(dy==1) - softscroll_offset);
 
   if (dx)
   {
-    x = (dx==1 ? 0 : SCR_FIELDX-1);
-    for(y=0;y<SCR_FIELDY;y++)
+    x = (dx==1 ? BX1 : BX2);
+    for(y=BY1; y<=BY2; y++)
       DrawScreenField(x,y);
   }
   if (dy)
   {
-    y = (dy==1 ? 0 : SCR_FIELDY-1);
-    for(x=0;x<SCR_FIELDX;x++)
+    y = (dy==1 ? BY1 : BY2);
+    for(x=BX1; x<=BX2; x++)
       DrawScreenField(x,y);
   }
 
-  redraw_mask|=REDRAW_FIELD;
+  redraw_mask |= REDRAW_FIELD;
 }
 
 BOOL MoveFigureOneStep(int dx, int dy, int real_dx, int real_dy)
@@ -2802,7 +2853,6 @@ BOOL MoveFigureOneStep(int dx, int dy, int real_dx, int real_dy)
   JX2 = oldJX;
   JY2 = oldJY;
 
-  PlayerMovPos = TILEX/4;
   PlayerMovPos = (dx > 0 || dy > 0 ? -1 : 1) * 3*TILEX/4;
 
   ScrollFigure(-1);
@@ -2824,6 +2874,7 @@ BOOL MoveFigureOneStep(int dx, int dy, int real_dx, int real_dy)
 BOOL MoveFigure(int dx, int dy)
 {
   static long move_delay = 0;
+  static int last_move_dir = MV_NO_MOVING;
   int moved = MF_NO_ACTION;
   int oldJX = JX, oldJY = JY;
 
@@ -2856,6 +2907,22 @@ BOOL MoveFigure(int dx, int dy)
       return(FALSE);
   }
 
+
+  if (last_move_dir & (MV_LEFT | MV_RIGHT))
+  {
+    if (!(moved |= MoveFigureOneStep(0,dy, dx,dy)))
+      moved |= MoveFigureOneStep(dx,0, dx,dy);
+  }
+  else
+  {
+    if (!(moved |= MoveFigureOneStep(dx,0, dx,dy)))
+      moved |= MoveFigureOneStep(0,dy, dx,dy);
+  }
+
+  last_move_dir = MV_NO_MOVING;
+
+
+  /*
   if (moved |= MoveFigureOneStep(dx,0, dx,dy))
     moved |= MoveFigureOneStep(0,dy, dx,dy);
   else
@@ -2863,6 +2930,7 @@ BOOL MoveFigure(int dx, int dy)
     moved |= MoveFigureOneStep(0,dy, dx,dy);
     moved |= MoveFigureOneStep(dx,0, dx,dy);
   }
+  */
 
   if (moved & MF_MOVING)
   {
@@ -2893,11 +2961,15 @@ BOOL MoveFigure(int dx, int dy)
       PlayerMovDir = (oldJY < JY ? MV_DOWN : MV_UP);
 
     DrawLevelField(JX,JY);     /* für "ErdreichAnbroeckeln()" */
+
+    last_move_dir = PlayerMovDir;
   }
 
   TestIfHeroHitsBadThing();
 
+  /*
   BackToFront();
+  */
 
   if (PlayerGone)
     RemoveHero();
@@ -2908,10 +2980,33 @@ BOOL MoveFigure(int dx, int dy)
 void ScrollFigure(int init)
 {
   static long actual_frame_counter;
+  static int oldX = -1, oldY = -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();
+    }
+
+    oldX = JX2;
+    oldY = JY2;
     actual_frame_counter = FrameCounter;
+
+    /*
+    redraw[redraw_x1 + oldX][redraw_y1 + oldY] = 1;
+    redraw_tiles++;
+    */
+
+    /*
+    DrawLevelElement(oldX,oldY, Feld[oldX][oldY]);
+    */
+
+    DrawPlayerField();
+
     return;
   }
   else if (!FrameReached(&actual_frame_counter,1))
@@ -2919,8 +3014,23 @@ void ScrollFigure(int init)
 
   PlayerMovPos += (PlayerMovPos > 0 ? -1 : 1) * TILEX/4;
 
-  DrawLevelElement(JX2,JY2, Feld[JX2][JY2]);
+  if (ScreenMovPos)
+  {
+    ScreenMovPos = PlayerMovPos;
+    redraw_mask |= REDRAW_FIELD;
+  }
+
+  if (Feld[oldX][oldY] == EL_UNSICHTBAR)
+    Feld[oldX][oldY] = EL_LEERRAUM;
+
+  DrawLevelElement(oldX,oldY, Feld[oldX][oldY]);
   DrawPlayerField();
+
+  if (!PlayerMovPos)
+  {
+    JX2 = JX;
+    JY2 = JY;
+  }
 }
 
 void TestIfGoodThingHitsBadThing(int goodx, int goody)
@@ -3493,7 +3603,6 @@ void RaiseScore(int value)
 {
   Score += value;
   DrawText(DX_SCORE,DY_SCORE,int2str(Score,5),FS_SMALL,FC_YELLOW);
-  BackToFront();
 }
 
 void RaiseScoreElement(int element)