Changeset 465 for branches/highdpi/LocalPlayer/Battle.pas

Timestamp:

Nov 30, 2023, 10:16:14 PM (5 months ago)

Author:

chronos

Message:

• Modified: Updated high dpi branch from trunk.
• Modified: Use generics.collections instead of fgl.
• Modified: Compile with Delphi syntax.

File:

• branches/highdpi/LocalPlayer/Battle.pas (modified) (16 diffs)

branches/highdpi/LocalPlayer/Battle.pas

@@ -32 +32 @@
     uix, ToLoc: Integer;
     Forecast: TBattleForecastEx;
-    IsSuicideQuery: boolean;
-  end;
-
-var
-  BattleDlg: TBattleDlg;
+    IsSuicideQuery: Boolean;
+  end;
+
 
 implementation
@@ -62 +60 @@
   TextSize: TSize;
   LabelText: string;
-  FirstStrike: boolean;
+  FirstStrike: Boolean;
 begin
   MaxBar := 65;
@@ -112 +110 @@
     VLightGradient(ca, xm - 8, ym + 8 + LABaseDamage, LADamage - LABaseDamage,
       FanaticColor);
-  DpiBitCanvas(ca, xm - 12, ym - 12, 24, 24,
+  DpiBitBltCanvas(ca, xm - 12, ym - 12, 24, 24,
     HGrSystem.Mask.Canvas, 26, 146, SRCAND);
-  DpiBitCanvas(ca, xm - 12, ym - 12, 24, 24,
+  DpiBitBltCanvas(ca, xm - 12, ym - 12, 24, 24,
     HGrSystem.Data.Canvas, 26, 146, SRCPAINT);
 
@@ -137 +135 @@
   if Forecast.EndHealthDef <= 0 then
   begin
-    DpiBitCanvas(ca, xm + 9 + LDDamage - 7, ym - 6, 14, 17,
+    DpiBitBltCanvas(ca, xm + 9 + LDDamage - 7, ym - 6, 14, 17,
       HGrSystem.Mask.Canvas, 51, 153, SRCAND);
-    DpiBitCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
+    DpiBitBltCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
       HGrSystem.Mask.Canvas, 51, 153, SRCAND);
-    DpiBitCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
+    DpiBitBltCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
       HGrSystem.Data.Canvas, 51, 153, SRCPAINT);
   end;
@@ -149 +147 @@
   begin
     if Forecast.EndHealthDef > 0 then
-      RisedTextOut(ca, xm + 10, ym - (TextSize.cy + 1) div 2, LabelText)
+      RisedTextOut(ca, xm + 10, ym - (TextSize.cy + 1) div 2, LabelText);
   end
   else
@@ -157 +155 @@
   if Forecast.EndHealthAtt <= 0 then
   begin
-    DpiBitCanvas(ca, xm - 6, ym + 9 + LADamage - 7, 14, 17,
+    DpiBitBltCanvas(ca, xm - 6, ym + 9 + LADamage - 7, 14, 17,
       HGrSystem.Mask.Canvas, 51, 153, SRCAND);
-    DpiBitCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
+    DpiBitBltCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
       HGrSystem.Mask.Canvas, 51, 153, SRCAND);
-    DpiBitCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
+    DpiBitBltCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
       HGrSystem.Data.Canvas, 51, 153, SRCPAINT);
   end;
@@ -171 +169 @@
     if Forecast.EndHealthAtt > 0 then
       RisedTextOut(ca, xm - (TextSize.cx + 1) div 2, ym + 8 + LAAvoidedDamage,
-        LabelText)
+        LabelText);
   end
   else
@@ -178 +176 @@
 
   IsoMap.SetOutput(Buffer);
-  DpiBitCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm + 8 + 4,
+  DpiBitBltCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm + 8 + 4,
     ym - 8 - 12 - 48);
   { if TerrType<fForest then
@@ -190 +188 @@
     end; }
   IsoMap.PaintUnit(1, 0, UnitInfo, 0);
-  DpiBitCanvas(ca, xm + 8 + 4, ym - 8 - 12 - 48, 66, 48, Buffer.Canvas,
+  DpiBitBltCanvas(ca, xm + 8 + 4, ym - 8 - 12 - 48, 66, 48, Buffer.Canvas,
     0, 0);
 
-  DpiBitCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm - 8 - 4 - 66,
+  DpiBitBltCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm - 8 - 4 - 66,
     ym + 8 + 12);
-  MakeUnitInfo(me, MyUn[uix], UnitInfo);
+  MakeUnitInfo(Me, MyUn[uix], UnitInfo);
   UnitInfo.Flags := UnitInfo.Flags and not unFortified;
   IsoMap.PaintUnit(1, 0, UnitInfo, 0);
-  DpiBitCanvas(ca, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas, 0, 0);
-end; { PaintBattleOutcome }
+  DpiBitBltCanvas(ca, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas, 0, 0);
+end;
 
 procedure TBattleDlg.FormCreate(Sender: TObject);
@@ -215 +213 @@
     ClientWidth := 300;
     ClientHeight := 288;
-    OKBtn.Visible := true;
-    CancelBtn.Visible := true;
+    OKBtn.Visible := True;
+    CancelBtn.Visible := True;
     Left := (DpiScreen.Width - ClientWidth) div 2; // center on screen
     Top := (DpiScreen.Height - ClientHeight) div 2;
@@ -224 +222 @@
     ClientWidth := 178;
     ClientHeight := 178;
-    OKBtn.Visible := false;
-    CancelBtn.Visible := false;
+    OKBtn.Visible := False;
+    CancelBtn.Visible := False;
   end;
 end;
@@ -231 +229 @@
 procedure TBattleDlg.FormPaint(Sender: TObject);
 var
-  ym, cix, p: Integer;
-  s, s1: string;
+  ym, cix, P: Integer;
+  S, s1: string;
 begin
   with Canvas do
@@ -240 +238 @@
     Brush.Style := bsClear;
     PaintBackground(self, 3 + Border, 3 + Border,
-      ClientWidth - (6 + 2 * Border), ClientHeight - (6 + 2 * Border))
+      ClientWidth - (6 + 2 * Border), ClientHeight - (6 + 2 * Border));
   end;
   Frame(Canvas, Border + 1, Border + 1, ClientWidth - (2 + Border),
@@ -252 +250 @@
   begin
     Canvas.Font.Assign(UniFont[ftCaption]);
-    s := Phrases.Lookup('TITLE_SUICIDE');
-    RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s)) div 2,
-      7 + Border, s);
+    S := Phrases.Lookup('TITLE_SUICIDE');
+    RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, S)) div 2,
+      7 + Border, S);
     Canvas.Font.Assign(UniFont[ftNormal]);
-    s := Phrases.Lookup('SUICIDE');
-    p := pos('\', s);
-    if p = 0 then
-      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s))
-        div 2, 205, s)
+    S := Phrases.Lookup('SUICIDE');
+    P := Pos('\', S);
+    if P = 0 then
+      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, S))
+        div 2, 205, S)
     else
     begin
-      s1 := copy(s, 1, p - 1);
+      s1 := Copy(S, 1, P - 1);
       RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s1)) div 2,
         205 - MessageLineSpacing div 2, s1);
-      s1 := copy(s, p + 1, 255);
+      s1 := Copy(S, P + 1, 255);
       RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s1)) div 2,
         205 + (MessageLineSpacing - MessageLineSpacing div 2), s1);
     end;
-    ym := 110
+    ym := 110;
   end
   else
@@ -297 +295 @@
 begin
   if not IsSuicideQuery then
-    Close
+    Close;
 end;
 
@@ -309 +307 @@
     if Key <> VK_ESCAPE then
       MainScreen.FormKeyDown(Sender, Key, Shift);
-  end
+  end;
 end;