X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FDDScrollBuffer.c;h=23ce4ce9af381573ff42c585aefa7f7cc3867ea5;hb=70e95507923cc6cfb20d9e9a74e8f5cc5f6e44de;hp=028af5429569052b93e95cf486d90b4e478e3805;hpb=0f5b7f63f2d3d75ba646795a3c1ea9fc4cee4845;p=rocksndiamonds.git

diff --git a/src/game_sp/DDScrollBuffer.c b/src/game_sp/DDScrollBuffer.c
index 028af542..23ce4ce9 100644
--- a/src/game_sp/DDScrollBuffer.c
+++ b/src/game_sp/DDScrollBuffer.c
@@ -131,17 +131,23 @@ void DDScrollBuffer_Cls(int BackColor)
   Buffer.BltColorFill(EmptyRect, BackColor);
 }
 
-void DDScrollBuffer_Blt()
+void DDScrollBuffer_Blt_Ext(Bitmap *target_bitmap)
 {
   RECT DR, SR;
   long tX, tY, L;
+  int sX, sY;
   // RECT ERect;
   // long Restore;
 
   if (NoDisplayFlag)
     return;
 
-#if 0
+#if 1
+  DR.left = 0;
+  DR.top = 0;
+  DR.right = SCR_FIELDX * TILEX;
+  DR.bottom = SCR_FIELDY * TILEY;
+#else
   // --- On Error GoTo BltEH
   DirectX.GetWindowRect(mhWnd, DR);
   // --- On Error GoTo 0
@@ -175,22 +181,66 @@ void DDScrollBuffer_Blt()
   }
 
 #if 1
-#if 0
-  printf("::: DDScrollBuffer.c: DDScrollBuffer_Blt(): blit from %d, %d [%ld, %ld] [%ld, %ld]\n",
-	 SR.left, SR.top, mScrollX, mScrollY, mDestXOff, mDestYOff);
+  SR.left = (SR.left < 0 ? 0 : SR.left);
+  SR.top  = (SR.top  < 0 ? 0 : SR.top);
+#endif
+
+#if 1
+  {
+    int full_xsize = (FieldWidth  - (menBorder.Checked ? 0 : 1)) * TILEX;
+    int full_ysize = (FieldHeight - (menBorder.Checked ? 0 : 1)) * TILEY;
+    int sxsize = SCR_FIELDX * TILEX;
+    int sysize = SCR_FIELDY * TILEY;
+
+    tX = (full_xsize < sxsize ? full_xsize : tX);
+    tY = (full_ysize < sysize ? full_ysize : tY);
+    sX = SX + (full_xsize < sxsize ? (sxsize - full_xsize) / 2 : 0);
+    sY = SY + (full_ysize < sysize ? (sysize - full_ysize) / 2 : 0);
+  }
+#endif
+
+#if 1
+  if (!menBorder.Checked)
+  {
+    SR.left += 16;
+    SR.top  += 16;
+  }
+#endif
+
+#if 1
+
+#if 1
+  printf("::: DDScrollBuffer.c: DDScrollBuffer_Blt(): blit from %d, %d [%ld, %ld] [%ld, %ld] [%ld, %ld]\n",
+	 SR.left, SR.top, mScrollX, mScrollY, mDestXOff, mDestYOff, tX, tY);
 #endif
 
 #if 0
-  BlitBitmap(screenBitmap, window,
-	     1600, 320,
-             SCR_FIELDX * TILEX, SCR_FIELDY * TILEY, SX, SY);
+  /* !!! quick and dirty -- FIX THIS !!! */
+  if (tape.playing && tape.fast_forward &&
+      target_bitmap == window &&
+      (FrameCounter % 2) != 0)
+    printf("::: FrameCounter == %d\n", FrameCounter);
+#endif
+
+#if 1
+  SyncDisplay();
+#endif
+
+#if 1
+  BlitBitmap(screenBitmap, target_bitmap,
+	     SR.left, SR.top, tX, tY, sX, sY);
 #else
-  BlitBitmap(screenBitmap, window,
+  BlitBitmap(screenBitmap, target_bitmap,
 	     SR.left, SR.top,
              SCR_FIELDX * TILEX, SCR_FIELDY * TILEY, SX, SY);
 #endif
 
+#if 1
+  FlushDisplay();
+#endif
+
   return;
+
 #endif
 
   // DDraw.WaitForVerticalBlank DDWAITVB_BLOCKBEGIN, 0
@@ -304,6 +354,11 @@ void DDScrollBuffer_Blt()
   // BltEH:
 }
 
+void DDScrollBuffer_Blt()
+{
+  DDScrollBuffer_Blt_Ext(window);
+}
+
 void DDScrollBuffer_ScrollTo(int X, int Y)
 {
   if (NoDisplayFlag)
@@ -316,7 +371,7 @@ void DDScrollBuffer_ScrollTo(int X, int Y)
   ScrollX = mScrollX;
   ScrollY = mScrollY;
 
-#if 1
+#if 0
   printf("::: DDScrollBuffer.c: DDScrollBuffer_ScrollTo():  mScroll: %ld, %ld [%d, %d]\n",
 	 mScrollX, mScrollY, X, Y);
 #endif
@@ -329,6 +384,11 @@ void DDScrollBuffer_ScrollTowards(int X, int Y, double Step)
   if (NoDisplayFlag)
     return;
 
+#if 0
+  printf("::: DDScrollBuffer.c: DDScrollBuffer_ScrollTowards(): (1) mScroll: %ld, %ld [%d, %d, %f]\n",
+	 mScrollX, mScrollY, X, Y, Step);
+#endif
+
   X = X / Stretch;
   Y = Y / Stretch;
   dx = X - mScrollX;
@@ -347,9 +407,9 @@ void DDScrollBuffer_ScrollTowards(int X, int Y, double Step)
   ScrollX = mScrollX;
   ScrollY = mScrollY;
 
-#if 1
-  printf("::: DDScrollBuffer.c: DDScrollBuffer_ScrollTowards():  mScroll: %ld, %ld\n",
-	 mScrollX, mScrollY);
+#if 0
+  printf("::: DDScrollBuffer.c: DDScrollBuffer_ScrollTowards(): (2) mScroll: %ld, %ld [%d, %d, %f]\n",
+	 mScrollX, mScrollY, X, Y, Step);
 #endif
 }
 
@@ -377,7 +437,7 @@ void DDScrollBuffer_SoftScrollTo(int X, int Y, long TimeMS, int FPS)
   Y = Y / Stretch;
   dx = X - mScrollX;
   dY = Y - mScrollY;
-  maxD = (Abs(dx) < Abs(dY) ?  Abs(dY) :  Abs(dY));
+  maxD = (Abs(dx) < Abs(dY) ? Abs(dY) : Abs(dx));
   StepCount = FPS * (TimeMS / (double)1000);
   if (StepCount > maxD)
     StepCount = maxD;
@@ -425,7 +485,7 @@ void DDScrollBuffer_SoftScrollTo(int X, int Y, long TimeMS, int FPS)
 SoftScrollEH:
   AlreadyRunning = False;
 
-#if 1
+#if 0
   printf("::: DDScrollBuffer.c: DDScrollBuffer_SoftScrollTo(): mScroll: %ld, %ld\n",
 	 mScrollX, mScrollY);
 #endif