Changeset 530 for trunk/LocalPlayer/CityScreen.pas

Timestamp:

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

Author:

chronos

Message:

• Modified: Use BitBltBitmap instead of BitBltCanvas if possible.

File:

• trunk/LocalPlayer/CityScreen.pas (modified) (10 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -275 +275 @@
 
     UnshareBitmap(Back);
-    BitBltCanvas(Back.Canvas, 0, 0, Width, Height,
-      MainTexture.Image.Canvas, 0, 0);
+    BitBltBitmap(Back, 0, 0, Width, Height, MainTexture.Image, 0, 0);
     ImageOp_B(Back, Template, 0, 0, 0, 0, Width, Height);
   end;
@@ -303 +302 @@
   Color2 := Colors.Canvas.Pixels[clkAge0 + Age, cliHouse];
   SmallCityMap.Canvas.FillRect(0, 0, SmallCityMap.Width, SmallCityMap.Height);
-  BitBltCanvas(SmallCityMap.Canvas, 0, 0, 83, hSmallMap,
-    SmallCityMapTemplate.Canvas, 83 * SizeClass, 0);
+  BitBltBitmap(SmallCityMap, 0, 0, 83, hSmallMap,
+    SmallCityMapTemplate, 83 * SizeClass, 0);
   if IsPort then
   begin
-    BitBltCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
-      SmallCityMapTemplate.Canvas, 332 + 15, 0);
+    BitBltBitmap(SmallCityMap, 83, 0, 15, hSmallMap,
+      SmallCityMapTemplate, 332 + 15, 0);
     ImageOp_CCC(SmallCityMap, 0, 0, 83, hSmallMap, Color0, Color1, Color2);
     Color2 := Colors.Canvas.Pixels[clkCity, cliWater];
@@ -315 +314 @@
   else
   begin
-    BitBltCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
-      SmallCityMapTemplate.Canvas, 332, 0);
+    BitBltBitmap(SmallCityMap, 83, 0, 15, hSmallMap,
+      SmallCityMapTemplate, 332, 0);
     ImageOp_CCC(SmallCityMap, 0, 0, wSmallMap, hSmallMap, Color0,
       Color1, Color2);
@@ -369 +368 @@
 begin
   UnshareBitmap(ZoomCityMap);
-  BitBltCanvas(ZoomCityMap.Canvas, 0, 0, wZoomMap, hZoomMap,
-    Back.Canvas, xZoomMap, yZoomMap);
+  BitBltBitmap(ZoomCityMap, 0, 0, wZoomMap, hZoomMap,
+    Back, xZoomMap, yZoomMap);
   if SmallMapMode = smImprovements then begin
     if ZoomArea < 3 then begin
@@ -527 +526 @@
   RedTex.ColorTextShade := $0000FF;
 
-  BitBltCanvas(Offscreen.Canvas, 0, 0, 640, 480, Back.Canvas, 0, 0);
+  BitBltBitmap(Offscreen, 0, 0, 640, 480, Back, 0, 0);
 
   Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
@@ -599 +598 @@
       False, AllowChange and IsCityAlive and
       (C.Status and csResourceWeightsMask = 0));
-    BitBltCanvas(Offscreen.Canvas, xmArea + 102, 42, 90, 33, Back.Canvas,
-      xmArea + 102, 42);
+    BitBltBitmap(Offscreen, xmArea + 102, 42, 90, 33, Back, xmArea + 102, 42);
 
     if IsCityAlive then
@@ -630 +628 @@
     else
       xGr := 141;
-    BitBltCanvas(Offscreen.Canvas, xmArea - 192 + 5 + I * D, ymArea - 96 - 29,
-      27, 30, HGrSystem.Mask.Canvas, xGr, 171, SRCAND); { shadow }
+    BitBltBitmap(Offscreen, xmArea - 192 + 5 + I * D, ymArea - 96 - 29,
+      27, 30, HGrSystem.Mask, xGr, 171, SRCAND); { shadow }
     Sprite(Offscreen, HGrSystem, xmArea - 192 + 4 + I * D, ymArea - 96 - 30, 27,
       30, xGr, 171);
@@ -642 +640 @@
   begin
     xGr := 1 + 112;
-    BitBltCanvas(Offscreen.Canvas, xmArea + 192 - 27 + 1 - I * D, 29 + 1, 27,
-      30, HGrSystem.Mask.Canvas, xGr, 171, SRCAND); { shadow }
+    BitBltBitmap(Offscreen, xmArea + 192 - 27 + 1 - I * D, 29 + 1, 27,
+      30, HGrSystem.Mask, xGr, 171, SRCAND); { shadow }
     Sprite(Offscreen, HGrSystem, xmArea + 192 - 27 - I * D, 29, 27, 30,
       xGr, 171);
@@ -788 +786 @@
 
   // small map
-  BitBltCanvas(Offscreen.Canvas, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
-    SmallCityMap.Canvas, 0, 0);
+  BitBltBitmap(Offscreen, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
+    SmallCityMap, 0, 0);
   if SmallMapMode = smImprovements then
     Frame(Offscreen.Canvas, xSmallMap + 48 * (ZoomArea div 3),
@@ -816 +814 @@
   Sprite(Offscreen, HGrSystem, X + 6, Y - 5, 10, 10, 154, 126);
 
-  BitBltCanvas(Offscreen.Canvas, xZoomMap, yZoomMap, wZoomMap, hZoomMap,
-    ZoomCityMap.Canvas, 0, 0);
+  BitBltBitmap(Offscreen, xZoomMap, yZoomMap, wZoomMap, hZoomMap, ZoomCityMap, 0, 0);
 
   for I := 0 to 5 do