X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FDDScrollBuffer.c;h=48a35ef12084aeb44410caeedc9b2586c91e2af1;hb=3c080c7b33b6dfcc6e0039b592c5f268535873e7;hp=1734aa8b7ebadc7d91d6d43285efa9892c622e89;hpb=5ba7f2d9a3f07f342afdf215a3307d5487cb6d43;p=rocksndiamonds.git

diff --git a/src/game_sp/DDScrollBuffer.c b/src/game_sp/DDScrollBuffer.c
index 1734aa8b..48a35ef1 100644
--- a/src/game_sp/DDScrollBuffer.c
+++ b/src/game_sp/DDScrollBuffer.c
@@ -16,11 +16,12 @@
 // ---   MTSTransactionMode  = 0  'NotAnMTSObject  // NotAnMTSObject
 // --- END
 
-static char *VB_Name = "DDScrollBuffer";
-static boolean VB_GlobalNameSpace = False;
-static boolean VB_Creatable = True;
-static boolean VB_PredeclaredId = False;
-static boolean VB_Exposed = False;
+// static char *VB_Name = "DDScrollBuffer";
+// static boolean VB_GlobalNameSpace = False;
+// static boolean VB_Creatable = True;
+// static boolean VB_PredeclaredId = False;
+// static boolean VB_Exposed = False;
+
 // --- Option Explicit
 
 // needs reference to: DirectX7 for Visual Basic Type Library
@@ -130,7 +131,7 @@ 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;
@@ -140,10 +141,11 @@ void DDScrollBuffer_Blt()
   if (NoDisplayFlag)
     return;
 
-
+#if 0
   // --- On Error GoTo BltEH
   DirectX.GetWindowRect(mhWnd, DR);
   // --- On Error GoTo 0
+#endif
 
   {
     tX = (DR.right - DR.left) / Stretch;
@@ -171,6 +173,40 @@ void DDScrollBuffer_Blt()
     //      DR.top = DR.top - Stretch * (mScrollY + mDestYOff)
     //    End If
   }
+
+#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);
+#endif
+
+#if 0
+  /* !!! 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,
+             SCR_FIELDX * TILEX, SCR_FIELDY * TILEY, SX, SY);
+#endif
+
+#if 1
+  FlushDisplay();
+#endif
+
+  return;
+
+#endif
+
   // DDraw.WaitForVerticalBlank DDWAITVB_BLOCKBEGIN, 0
   if (IS_NOTHING(&Buffer, sizeof(Buffer)))
     return;
@@ -178,11 +214,12 @@ void DDScrollBuffer_Blt()
   if (IS_NOTHING(&PrimarySurface, sizeof(PrimarySurface)))
     return;
 
-  L = PrimarySurface_Blt(DR, Buffer, SR, DDBLT_WAIT);
+  L = PrimarySurface.Blt(DR, &Buffer, SR, DDBLT_WAIT);
   if (L != DD_OK)
   {
     switch (L)
     {
+#if 0
       case DDERR_GENERIC:
         Debug.Assert(False);
         break;
@@ -242,6 +279,7 @@ void DDScrollBuffer_Blt()
       case DDERR_SURFACEBUSY:
         Debug.Assert(False);
         break;
+#endif
 
       case DDERR_SURFACELOST:
         DDraw.RestoreAllSurfaces();
@@ -255,6 +293,7 @@ void DDScrollBuffer_Blt()
         // ClipToWindow 0
         break;
 
+#if 0
       case DDERR_UNSUPPORTED:
         Debug.Assert(False);
         break;
@@ -266,6 +305,7 @@ void DDScrollBuffer_Blt()
       default:
         Debug.Assert(False);
         break;
+#endif
     }
   }
 
@@ -278,6 +318,11 @@ void DDScrollBuffer_Blt()
   // BltEH:
 }
 
+void DDScrollBuffer_Blt()
+{
+  DDScrollBuffer_Blt_Ext(window);
+}
+
 void DDScrollBuffer_ScrollTo(int X, int Y)
 {
   if (NoDisplayFlag)
@@ -289,6 +334,11 @@ void DDScrollBuffer_ScrollTo(int X, int Y)
   mScrollY = Y;
   ScrollX = mScrollX;
   ScrollY = mScrollY;
+
+#if 0
+  printf("::: DDScrollBuffer.c: DDScrollBuffer_ScrollTo():  mScroll: %ld, %ld [%d, %d]\n",
+	 mScrollX, mScrollY, X, Y);
+#endif
 }
 
 void DDScrollBuffer_ScrollTowards(int X, int Y, double Step)
@@ -298,6 +348,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;
@@ -315,16 +370,23 @@ void DDScrollBuffer_ScrollTowards(int X, int Y, double Step)
   mScrollY = mScrollY + dY * r;
   ScrollX = mScrollX;
   ScrollY = mScrollY;
+
+#if 0
+  printf("::: DDScrollBuffer.c: DDScrollBuffer_ScrollTowards(): (2) mScroll: %ld, %ld [%d, %d, %f]\n",
+	 mScrollX, mScrollY, X, Y, Step);
+#endif
 }
 
 void DDScrollBuffer_SoftScrollTo(int X, int Y, long TimeMS, int FPS)
 {
   double dx, dY;
+#if 0
   TickCountObject Tick;
+#endif
   long dT, StepCount;
   double T, tStep;
   long oldX, oldY, maxD;
-  boolean AlreadyRunning;
+  static boolean AlreadyRunning = False;
 
   if (NoDisplayFlag)
     return;
@@ -339,7 +401,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;
@@ -359,7 +421,11 @@ void DDScrollBuffer_SoftScrollTo(int X, int Y, long TimeMS, int FPS)
       goto SoftScrollEH;
 
     // If Claim Then Exit For
+
+#if 0
     Tick.DelayMS(dT, False);
+#endif
+
     mScrollX = oldX + T * dx;
     mScrollY = oldY + T * dY;
     ScrollX = mScrollX;
@@ -370,7 +436,10 @@ void DDScrollBuffer_SoftScrollTo(int X, int Y, long TimeMS, int FPS)
   if (UserDragFlag)
     goto SoftScrollEH;
 
+#if 0
   Tick.DelayMS(dT, False);
+#endif
+
   mScrollX = X;
   mScrollY = Y;
   ScrollX = mScrollX;
@@ -379,4 +448,9 @@ void DDScrollBuffer_SoftScrollTo(int X, int Y, long TimeMS, int FPS)
 
 SoftScrollEH:
   AlreadyRunning = False;
+
+#if 0
+  printf("::: DDScrollBuffer.c: DDScrollBuffer_SoftScrollTo(): mScroll: %ld, %ld\n",
+	 mScrollX, mScrollY);
+#endif
 }