Changeset 505 for trunk/LocalPlayer

Timestamp:

Dec 24, 2023, 11:24:57 PM (12 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk/LocalPlayer

Files:

• Battle.pas (modified) (3 diffs)
• MessgEx.pas (modified) (7 diffs)

trunk/LocalPlayer/Battle.pas

@@ -112 +112 @@
     VLightGradient(ca, xm - 8, ym + 8 + LABaseDamage, LADamage - LABaseDamage,
       FanaticColor);
-  BitBltCanvas(ca, xm - 12, ym - 12, 24, 24,
-    HGrSystem.Mask.Canvas, 26, 146, SRCAND);
-  BitBltCanvas(ca, xm - 12, ym - 12, 24, 24,
-    HGrSystem.Data.Canvas, 26, 146, SRCPAINT);
+  Sprite(ca, HGrSystem, xm - 12, ym - 12, 24, 24, 26, 146);
 
   LabelText := Format('%d', [Forecast.AStr]);
@@ -139 +136 @@
     BitBltCanvas(ca, xm + 9 + LDDamage - 7, ym - 6, 14, 17,
       HGrSystem.Mask.Canvas, 51, 153, SRCAND);
-    BitBltCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
-      HGrSystem.Mask.Canvas, 51, 153, SRCAND);
-    BitBltCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
-      HGrSystem.Data.Canvas, 51, 153, SRCPAINT);
+    Sprite(ca, HGrSystem, xm + 8 + LDDamage - 7, ym - 7, 14, 17, 51, 153);
   end;
   LabelText := Format('%d', [DDamage]);
@@ -159 +153 @@
     BitBltCanvas(ca, xm - 6, ym + 9 + LADamage - 7, 14, 17,
       HGrSystem.Mask.Canvas, 51, 153, SRCAND);
-    BitBltCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
-      HGrSystem.Mask.Canvas, 51, 153, SRCAND);
-    BitBltCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
-      HGrSystem.Data.Canvas, 51, 153, SRCPAINT);
+    Sprite(ca, HGrSystem, xm - 7, ym + 8 + LADamage - 7, 14, 17, 51, 153);
   end;
   LabelText := Format('%d', [MyUn[uix].Health - Forecast.EndHealthAtt]);

trunk/LocalPlayer/MessgEx.pas

@@ -195 +195 @@
   if GameMode = cMovie then
   begin
-    if not((GameMode = cMovie) and (MovieSpeed = 4)) then
+    if not ((GameMode = cMovie) and (MovieSpeed = 4)) then
     begin
       MovieCancelled := False;
@@ -230 +230 @@
   ix, iy, xDst, yDst, dx, dy, xIcon, yIcon: Integer;
   BookRect: TRect;
-  x1, xR, yR, share: Single;
+  x1, xR, yR, Share: Single;
   Screwed: TScrewed;
   SrcPtr: TPixelPointer;
@@ -257 +257 @@
           for dy := 0 to 1 do begin
             if dx = 0 then
-              share := 1 - xR
+              Share := 1 - xR
             else
-              share := xR;
+              Share := xR;
             if dy = 0 then
-              share := share * (1 - yR)
+              Share := Share * (1 - yR)
             else
-              share := share * yR;
+              Share := Share * yR;
             if (xDst + dx < wScrewed) and
             (yDst + dy < hScrewed) then begin
               Screwed[xDst + dx, yDst + dy, 0] := Screwed[xDst + dx, yDst + dy, 0]
-                + share * SrcPtr.Pixel^.B;
+                + Share * SrcPtr.Pixel^.B;
               Screwed[xDst + dx, yDst + dy, 1] := Screwed[xDst + dx, yDst + dy, 1]
-                + share * SrcPtr.Pixel^.G;
+                + Share * SrcPtr.Pixel^.G;
               Screwed[xDst + dx, yDst + dy, 2] := Screwed[xDst + dx, yDst + dy, 2]
-                + share * SrcPtr.Pixel^.R;
+                + Share * SrcPtr.Pixel^.R;
               Screwed[xDst + dx, yDst + dy, 3] := Screwed[xDst + dx, yDst + dy,
-                3] + share;
+                3] + Share;
             end;
         end;
@@ -313 +313 @@
 procedure TMessgExDlg.PaintEnemyArmy;
 var
-  emix, ix, iy, X, Y, count, UnitsInLine: Integer;
+  emix, ix, iy, X, Y, Count, UnitsInLine: Integer;
 begin
   ix := 0;
@@ -322 +322 @@
     UnitsInLine := nLostArmy;
   for emix := 0 to MyRO.nEnemyModel - 1 do
-    for count := 0 to LostArmy[emix] - 1 do
+    for Count := 0 to LostArmy[emix] - 1 do
     begin
       X := Width div 2 + ix * 64 - UnitsInLine * 32;
@@ -328 +328 @@
       with MyRO.EnemyModel[emix], Tribe[Owner].ModelPicture[mix] do
       begin
-        BitBltCanvas(Canvas, X, Y, 64, 48, HGr.Mask.Canvas,
-          pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCAND);
-        BitBltCanvas(Canvas, X, Y, 64, 48, HGr.Data.Canvas,
-          pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCPAINT);
+        Sprite(Canvas, HGr, X, Y, 64, 48, pix mod 10 * 65 + 1, pix div 10 * 49 + 1);
       end;
 
@@ -401 +398 @@
         FrameImage(Canvas, BigImp, Width div 2 - 28, 24, xSizeBig,
           ySizeBig, 0, 0);
-        BitBltCanvas(Canvas, Width div 2 - 32, 20, 64, 44,
-          HGr.Mask.Canvas, pix mod 10 * 65 + 1,
-          pix div 10 * 49 + 1, SRCAND);
-        BitBltCanvas(Canvas, Width div 2 - 32, 20, 64, 44,
-          HGr.Data.Canvas, pix mod 10 * 65 + 1,
-          pix div 10 * 49 + 1, SRCPAINT);
+        Sprite(Canvas, HGr, Width div 2 - 32, 20, 64, 44, pix mod 10 * 65 + 1,
+          pix div 10 * 49 + 1);
       end;
     mikBook: