Changeset 530 for trunk/LocalPlayer/Term.pas

Timestamp:

Feb 24, 2024, 8:04:26 PM (2 months ago)

Author:

chronos

Message:

• Modified: Use BitBltBitmap instead of BitBltCanvas if possible.

File:

• trunk/LocalPlayer/Term.pas (modified) (8 diffs)

trunk/LocalPlayer/Term.pas

@@ -4656 +4656 @@
     Exit;
 
-  NoMap.BitBltBitmap(Panel, -xMap - MapOffset, -yMap + MapHeight - Overlap, xMidPanel,
+  NoMap.BitBltBitmapOutput(Panel, -xMap - MapOffset, -yMap + MapHeight - Overlap, xMidPanel,
     Overlap, 0, 0, SRCCOPY);
-  NoMap.BitBltBitmap(Panel, -xMap - MapOffset + xRightPanel,
+  NoMap.BitBltBitmapOutput(Panel, -xMap - MapOffset + xRightPanel,
     -yMap + MapHeight - Overlap, Panel.Width - xRightPanel, Overlap,
     xRightPanel, 0, SRCCOPY);
@@ -4858 +4858 @@
 begin
   with MainMap do begin
-    BitBltCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
-      MiniMap.Bitmap.Canvas, 0, 0);
+    BitBltBitmap(Panel, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+      MiniMap.Bitmap, 0, 0);
     if MarkCityLoc >= 0 then
       Sprite(Panel, HGrSystem, xMini - 2 + (4 * G.lx + 2 * (MarkCityLoc mod G.lx)
@@ -4951 +4951 @@
           ClientWidth - xPalace + xSizeBig + 1, yPalace + ySizeBig + 1,
           $FFFFFF, $B0B0B0);
-        BitBltCanvas(Panel.Canvas, ClientWidth - xPalace, yPalace, xSizeBig,
-          ySizeBig, HGrSystem2.Data.Canvas, 70, 123);
+        BitBltBitmap(Panel, ClientWidth - xPalace, yPalace, xSizeBig,
+          ySizeBig, HGrSystem2.Data, 70, 123);
       end
       else if MyRO.NatBuilt[imPalace] > 0 then
@@ -5833 +5833 @@
       PaintLoc(MouseLoc, 2);
       MiniMapPaint;
-      BitBltCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
-        MiniMap.Bitmap.Canvas, 0, 0);
+      BitBltBitmap(Panel, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+        MiniMap.Bitmap, 0, 0);
       with MainMap do begin
         if ywmax <= 0 then
@@ -6653 +6653 @@
     for Step := 0 to Abs(Step1 - Step0) do
     begin
-      BitBltCanvas(Buffer.Canvas, 0, 0, xRange, yRange,
-        Offscreen.Canvas, xMin, yMin);
+      BitBltBitmap(Buffer, 0, 0, xRange, yRange, Offscreen, xMin, yMin);
       if Step1 <> Step0 then
       begin
@@ -6696 +6695 @@
   if Restore then
   begin
-    BitBltCanvas(Buffer.Canvas, 0, 0, xRange, yRange, Offscreen.Canvas, xMin, yMin);
+    BitBltBitmap(Buffer, 0, 0, xRange, yRange, Offscreen, xMin, yMin);
     PaintBufferToScreen(xMin, yMin, xRange, yRange);
   end;
@@ -7832 +7831 @@
           yw := ywmax;
       end;
-      BitBltCanvas(Buffer.Canvas, 0, 0, G.lx * 2, G.ly, MiniMap.Bitmap.Canvas, 0, 0);
+      BitBltBitmap(Buffer, 0, 0, G.lx * 2, G.ly, MiniMap.Bitmap, 0, 0);
       if ywmax <= 0 then
         Frame(Buffer.Canvas, X - xMini - 2 - MapWidth div (xxt * 2), 0,
@@ -7841 +7840 @@
           X - xMini - 2 + MapWidth div (xxt * 2) - 1, yw + MapHeight div yyt -
           2, MainTexture.ColorMark, MainTexture.ColorMark);
-      BitBltCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
-        Buffer.Canvas, 0, 0);
+      BitBltBitmap(Panel, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+        Buffer, 0, 0);
       MainOffscreenPaint;
       RectInvalidate(xMini + 2, TopBarHeight + MapHeight - Overlap + yMini + 2,