Changeset 188 for trunk/LocalPlayer/MessgEx.pas

Timestamp:

May 6, 2020, 11:21:12 PM (4 years ago)

Author:

chronos

Message:

• Modified: Simplified code by replacing BitBlt which uses always handles by BitBltCanvas which uses directly TCanvas objects. Used default ROP SRCCOPY.

File:

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

trunk/LocalPlayer/MessgEx.pas

@@ -291 +291 @@
 
   // paint
-  BitBltCanvas(LogoBuffer.Canvas, 0, 0, wb, hb, ca, x, y, SRCCOPY);
+  BitBltCanvas(LogoBuffer.Canvas, 0, 0, wb, hb, ca, x, y);
 
   if IconIndex >= 0 then
@@ -304 +304 @@
   ImageOp_BCC(LogoBuffer, Templates, 0, 0, xb, yb, wb, hb, clCover, clPage);
 
-  BitBlt(ca.Handle, x, y, wb, hb, LogoBuffer.Canvas.Handle, 0, 0, SRCCOPY);
+  BitBltCanvas(ca, x, y, wb, hb, LogoBuffer.Canvas, 0, 0);
 end;
 
@@ -328 +328 @@
       with MyRO.EnemyModel[emix], Tribe[Owner].ModelPicture[mix] do
       begin
-        BitBlt(Canvas.Handle, x, y, 64, 48, GrExt[HGr].Mask.Canvas.Handle,
+        BitBltCanvas(Canvas, x, y, 64, 48, GrExt[HGr].Mask.Canvas,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCAND);
-        BitBlt(Canvas.Handle, x, y, 64, 48, GrExt[HGr].Data.Canvas.Handle,
+        BitBltCanvas(Canvas, x, y, 64, 48, GrExt[HGr].Data.Canvas,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCPAINT);
       end;
@@ -371 +371 @@
       begin
         p1 := MyRO.Wonder[IconIndex].EffectiveOwner;
-        BitBlt(Buffer.Canvas.Handle, 0, 0, xSizeBig + 2 * GlowRange,
-          ySizeBig + 2 * GlowRange, Canvas.Handle,
-          ClientWidth div 2 - (28 + GlowRange), 24 - GlowRange, SRCCOPY);
-        BitBlt(Buffer.Canvas.Handle, GlowRange, GlowRange, xSizeBig, ySizeBig,
-          BigImp.Canvas.Handle, IconIndex mod 7 * xSizeBig,
-          (IconIndex + SystemIconLines * 7) div 7 * ySizeBig, SRCCOPY);
+        BitBltCanvas(Buffer.Canvas, 0, 0, xSizeBig + 2 * GlowRange,
+          ySizeBig + 2 * GlowRange, Canvas,
+          ClientWidth div 2 - (28 + GlowRange), 24 - GlowRange);
+        BitBltCanvas(Buffer.Canvas, GlowRange, GlowRange, xSizeBig, ySizeBig,
+          BigImp.Canvas, IconIndex mod 7 * xSizeBig,
+          (IconIndex + SystemIconLines * 7) div 7 * ySizeBig);
         if p1 < 0 then
           GlowFrame(Buffer, GlowRange, GlowRange, xSizeBig, ySizeBig, $000000)
@@ -382 +382 @@
           GlowFrame(Buffer, GlowRange, GlowRange, xSizeBig, ySizeBig,
             Tribe[p1].Color);
-        BitBlt(Canvas.Handle, ClientWidth div 2 - (28 + GlowRange),
+        BitBltCanvas(Canvas, ClientWidth div 2 - (28 + GlowRange),
           24 - GlowRange, xSizeBig + 2 * GlowRange, ySizeBig + 2 * GlowRange,
-          Buffer.Canvas.Handle, 0, 0, SRCCOPY);
+          Buffer.Canvas, 0, 0);
       end
       else
@@ -400 +400 @@
         FrameImage(Canvas, BigImp, ClientWidth div 2 - 28, 24, xSizeBig,
           ySizeBig, 0, 0);
-        BitBlt(Canvas.Handle, ClientWidth div 2 - 32, 20, 64, 44,
-          GrExt[HGr].Mask.Canvas.Handle, pix mod 10 * 65 + 1,
+        BitBltCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
+          GrExt[HGr].Mask.Canvas, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1, SRCAND);
-        BitBlt(Canvas.Handle, ClientWidth div 2 - 32, 20, 64, 44,
-          GrExt[HGr].Data.Canvas.Handle, pix mod 10 * 65 + 1,
+        BitBltCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
+          GrExt[HGr].Data.Canvas, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1, SRCPAINT);
       end;
@@ -415 +415 @@
         Frame(Canvas, ClientWidth div 2 - 32 - 1, 24 - 1,
           ClientWidth div 2 + 32, 24 + 48, $000000, $000000);
-        BitBlt(Canvas.Handle, ClientWidth div 2 - 32, 24, 64, 48,
-          GrExt[Tribe[IconIndex].faceHGr].Data.Canvas.Handle,
+        BitBltCanvas(Canvas, ClientWidth div 2 - 32, 24, 64, 48,
+          GrExt[Tribe[IconIndex].faceHGr].Data.Canvas,
           1 + Tribe[IconIndex].facepix mod 10 * 65,
-          1 + Tribe[IconIndex].facepix div 10 * 49, SRCCOPY)
+          1 + Tribe[IconIndex].facepix div 10 * 49)
       end;
     mikPureIcon:
@@ -430 +430 @@
       begin
         BitBltCanvas(Buffer.Canvas, 0, 0, 140, 120, Canvas,
-          (ClientWidth - 140) div 2, 24, SRCCOPY);
+          (ClientWidth - 140) div 2, 24);
         ImageOp_BCC(Buffer, Templates, 0, 0, 1, 279, 140, 120, 0, $FFFFFF);
-        BitBlt(Canvas.Handle, (ClientWidth - 140) div 2, 24, 140, 120,
-          Buffer.Canvas.Handle, 0, 0, SRCCOPY);
+        BitBltCanvas(Canvas, (ClientWidth - 140) div 2, 24, 140, 120,
+          Buffer.Canvas, 0, 0);
       end;
     mikMyArmy: