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

Timestamp:

Apr 6, 2021, 8:11:02 PM (4 years ago)

Author:

chronos

Message:

• Modified: Merged trunk branch version r348 into highdpi branch.

File:

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

branches/highdpi/LocalPlayer/Battle.pas

@@ -6 +6 @@
 uses
   UDpiControls, ScreenTools, Protocol, ButtonBase, ButtonA, Types, LCLIntf, LCLType,
-  SysUtils, Classes, Graphics, Controls, Forms, DrawDlg;
+  SysUtils, Classes, Graphics, Controls, Forms, DrawDlg, IsoEngine;
 
 type
+
+  { TBattleDlg }
+
   TBattleDlg = class(TDrawDlg)
     OKBtn: TButtonA;
     CancelBtn: TButtonA;
+    procedure FormDestroy(Sender: TObject);
     procedure FormPaint(Sender: TObject);
     procedure FormMouseDown(Sender: TObject; Button: TMouseButton;
@@ -21 +25 @@
     procedure OKBtnClick(Sender: TObject);
     procedure CancelBtnClick(Sender: TObject);
+    procedure PaintBattleOutcome(ca: TDpiCanvas; xm, ym, uix, ToLoc: Integer;
+      Forecast: TBattleForecastEx);
+  private
+    IsoMap: TIsoMap;
   public
     uix, ToLoc: Integer;
@@ -30 +38 @@
   BattleDlg: TBattleDlg;
 
-procedure PaintBattleOutcome(ca: TDpiCanvas; xm, ym, uix, ToLoc: Integer;
-  Forecast: TBattleForecastEx);
-
 implementation
 
 uses
-  Term, ClientTools, IsoEngine;
+  Term, ClientTools;
 
 {$R *.lfm}
@@ -48 +53 @@
   FirstStrikeColor = $A0A0A0;
 
-procedure PaintBattleOutcome(ca: TDpiCanvas; xm, ym, uix, ToLoc: Integer;
+procedure TBattleDlg.PaintBattleOutcome(ca: TDpiCanvas; xm, ym, uix, ToLoc: Integer;
   Forecast: TBattleForecastEx);
 var
@@ -108 +113 @@
       FanaticColor);
   DpiBitCanvas(ca, xm - 12, ym - 12, 24, 24,
-    GrExt[HGrSystem].Mask.Canvas, 26, 146, SRCAND);
+    HGrSystem.Mask.Canvas, 26, 146, SRCAND);
   DpiBitCanvas(ca, xm - 12, ym - 12, 24, 24,
-    GrExt[HGrSystem].Data.Canvas, 26, 146, SRCPAINT);
+    HGrSystem.Data.Canvas, 26, 146, SRCPAINT);
 
   LabelText := Format('%d', [Forecast.AStr]);
@@ -133 +138 @@
   begin
     DpiBitCanvas(ca, xm + 9 + LDDamage - 7, ym - 6, 14, 17,
-      GrExt[HGrSystem].Mask.Canvas, 51, 153, SRCAND);
+      HGrSystem.Mask.Canvas, 51, 153, SRCAND);
     DpiBitCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
-      GrExt[HGrSystem].Mask.Canvas, 51, 153, SRCAND);
+      HGrSystem.Mask.Canvas, 51, 153, SRCAND);
     DpiBitCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
-      GrExt[HGrSystem].Data.Canvas, 51, 153, SRCPAINT);
+      HGrSystem.Data.Canvas, 51, 153, SRCPAINT);
   end;
   LabelText := Format('%d', [DDamage]);
@@ -153 +158 @@
   begin
     DpiBitCanvas(ca, xm - 6, ym + 9 + LADamage - 7, 14, 17,
-      GrExt[HGrSystem].Mask.Canvas, 51, 153, SRCAND);
+      HGrSystem.Mask.Canvas, 51, 153, SRCAND);
     DpiBitCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
-      GrExt[HGrSystem].Mask.Canvas, 51, 153, SRCAND);
+      HGrSystem.Mask.Canvas, 51, 153, SRCAND);
     DpiBitCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
-      GrExt[HGrSystem].Data.Canvas, 51, 153, SRCPAINT);
+      HGrSystem.Data.Canvas, 51, 153, SRCPAINT);
   end;
   LabelText := Format('%d', [MyUn[uix].Health - Forecast.EndHealthAtt]);
@@ -172 +177 @@
       (LADamage - LAAvoidedDamage - TextSize.cy) div 2, LabelText);
 
-  NoMap.SetOutput(Buffer);
+  IsoMap.SetOutput(Buffer);
   DpiBitCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm + 8 + 4,
     ym - 8 - 12 - 48);
@@ -184 +189 @@
     else Sprite(Buffer,HGrTerrain,0,16,66,32,1+7*(xxt*2+1),1+yyt+2*(2+TerrType-fForest)*(yyt*3+1));
     end; }
-  NoMap.PaintUnit(1, 0, UnitInfo, 0);
+  IsoMap.PaintUnit(1, 0, UnitInfo, 0);
   DpiBitCanvas(ca, xm + 8 + 4, ym - 8 - 12 - 48, 66, 48, Buffer.Canvas,
     0, 0);
@@ -192 +197 @@
   MakeUnitInfo(me, MyUn[uix], UnitInfo);
   UnitInfo.Flags := UnitInfo.Flags and not unFortified;
-  NoMap.PaintUnit(1, 0, UnitInfo, 0);
+  IsoMap.PaintUnit(1, 0, UnitInfo, 0);
   DpiBitCanvas(ca, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas, 0, 0);
 end; { PaintBattleOutcome }
@@ -198 +203 @@
 procedure TBattleDlg.FormCreate(Sender: TObject);
 begin
+  IsoMap := TIsoMap.Create;
   OKBtn.Caption := Phrases.Lookup('BTN_YES');
   CancelBtn.Caption := Phrases.Lookup('BTN_NO');
@@ -276 +282 @@
 end;
 
+procedure TBattleDlg.FormDestroy(Sender: TObject);
+begin
+  FreeAndNil(IsoMap);
+end;
+
 procedure TBattleDlg.FormMouseDown(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; X, Y: Integer);