X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_sp%2FDDScrollBuffer.c;h=62257d0314c403d026e83152cec72c5999d31e95;hp=d90835b3e50ef804e0d220600cec84b35fea16bd;hb=115ce6f2da1914d68b0fe0e5f9082973190dacdd;hpb=4145364edf9ddec790b586344f9570145ae39896

diff --git a/src/game_sp/DDScrollBuffer.c b/src/game_sp/DDScrollBuffer.c
index d90835b3..62257d03 100644
--- a/src/game_sp/DDScrollBuffer.c
+++ b/src/game_sp/DDScrollBuffer.c
@@ -13,7 +13,37 @@ int mScrollX_last, mScrollY_last;
 int ScreenBuffer[2 + MAX_PLAYFIELD_WIDTH + 2][2 + MAX_PLAYFIELD_HEIGHT + 2];
 
 
-void RestorePlayfield()
+int getFieldbufferOffsetX_SP(void)
+{
+  int px = 2 * TILEX + (mScrollX - mScrollX_last) % TILEX;
+
+  /* scroll correction for even number of visible tiles (half tile shifted) */
+  px += game_sp.scroll_xoffset;
+
+  if (ExplosionShakeMurphy != 0)
+    px += TILEX / 2 - GetSimpleRandom(TILEX + 1);
+
+  px = px * TILESIZE_VAR / TILESIZE;
+
+  return px;
+}
+
+int getFieldbufferOffsetY_SP(void)
+{
+  int py = 2 * TILEY + (mScrollY - mScrollY_last) % TILEY;
+
+  /* scroll correction for even number of visible tiles (half tile shifted) */
+  py += game_sp.scroll_yoffset;
+
+  if (ExplosionShakeMurphy != 0)
+    py += TILEY / 2 - GetSimpleRandom(TILEX + 1);
+
+  py = py * TILESIZE_VAR / TILESIZE;
+
+  return py;
+}
+
+void RestorePlayfield(void)
 {
   int x1 = mScrollX / TILEX - 2;
   int y1 = mScrollY / TILEY - 2;
@@ -118,12 +148,12 @@ static void ScrollPlayfieldIfNeededExt(boolean reset)
   }
 }
 
-static void ScrollPlayfieldIfNeeded()
+static void ScrollPlayfieldIfNeeded(void)
 {
   ScrollPlayfieldIfNeededExt(FALSE);
 }
 
-void InitScrollPlayfield()
+void InitScrollPlayfield(void)
 {
   ScrollPlayfieldIfNeededExt(TRUE);
 }
@@ -138,6 +168,17 @@ void UpdatePlayfield(boolean force_redraw)
   int num_redrawn = 0;
 #endif
 
+  if (force_redraw)
+  {
+    // force re-initialization of graphics status variables
+    for (y = DisplayMinY; y <= DisplayMaxY; y++)
+      for (x = DisplayMinX; x <= DisplayMaxX; x++)
+	GfxGraphic[x][y] = -1;
+
+    // force complete playfield redraw
+    DisplayLevel();
+  }
+
   for (y = DisplayMinY; y <= DisplayMaxY; y++)
   {
     for (x = DisplayMinX; x <= DisplayMaxX; x++)
@@ -201,31 +242,16 @@ void BlitScreenToBitmap_SP(Bitmap *target_bitmap)
 {
   /* copy playfield buffer to target bitmap at scroll position */
 
-  int px = 2 * TILEX + (mScrollX - mScrollX_last) % TILEX;
-  int py = 2 * TILEY + (mScrollY - mScrollY_last) % TILEY;
-  int sx, sy, sxsize, sysize;
+  int px = getFieldbufferOffsetX_SP();
+  int py = getFieldbufferOffsetY_SP();
   int xsize = SXSIZE;
   int ysize = SYSIZE;
   int full_xsize = (FieldWidth  - (menBorder ? 0 : 1)) * TILEX_VAR;
   int full_ysize = (FieldHeight - (menBorder ? 0 : 1)) * TILEY_VAR;
-
-  sxsize = (full_xsize < xsize ? full_xsize : xsize);
-  sysize = (full_ysize < ysize ? full_ysize : ysize);
-  sx = SX + (full_xsize < xsize ? (xsize - full_xsize) / 2 : 0);
-  sy = SY + (full_ysize < ysize ? (ysize - full_ysize) / 2 : 0);
-
-  /* scroll correction for even number of visible tiles (half tile shifted) */
-  px += game_sp.scroll_xoffset;
-  py += game_sp.scroll_yoffset;
-
-  if (ExplosionShakeMurphy != 0)
-  {
-    px += TILEX / 2 - GetSimpleRandom(TILEX + 1);
-    py += TILEY / 2 - GetSimpleRandom(TILEX + 1);
-  }
-
-  px = px * TILESIZE_VAR / TILESIZE;
-  py = py * TILESIZE_VAR / TILESIZE;
+  int sx = SX + (full_xsize < xsize ? (xsize - full_xsize) / 2 : 0);
+  int sy = SY + (full_ysize < ysize ? (ysize - full_ysize) / 2 : 0);
+  int sxsize = (full_xsize < xsize ? full_xsize : xsize);
+  int sysize = (full_ysize < ysize ? full_ysize : ysize);
 
   BlitBitmap(bitmap_db_field_sp, target_bitmap, px, py, sxsize, sysize, sx, sy);
 }