Changeset 349 for branches/highdpi/LocalPlayer/UnitStat.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/UnitStat.pas (modified) (9 diffs)

branches/highdpi/LocalPlayer/UnitStat.pas

@@ -7 +7 @@
   UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
-  ButtonB, ButtonC;
+  ButtonB, ButtonC, IsoEngine;
 
 type
@@ -24 +24 @@
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure HelpBtnClick(Sender: TObject);
-
+  private
+    NoMap: TIsoMap;
   public
     procedure CheckAge;
@@ -51 +52 @@
 
 uses
-  Tribes, IsoEngine, Help, Directories;
+  Tribes, Help, Directories;
 
 {$R *.lfm}
@@ -73 +74 @@
 begin
   inherited;
+  NoMap := TIsoMap.Create;
   AgePrepared := -2;
   TitleHeight := DpiScreen.Height;
@@ -91 +93 @@
   FreeAndNil(Template);
   FreeAndNil(Back);
+  FreeAndNil(NoMap);
 end;
 
@@ -136 +139 @@
       begin
         mox := @MyRO.EnemyModel[emix];
-        if Tribe[owner].ModelPicture[mix].HGr = 0 then
+        if not Assigned(Tribe[owner].ModelPicture[mix].HGr) then
           InitEnemyModel(emix);
       end
@@ -521 +524 @@
     begin
       if Kind in [dkOwnUnit, dkEnemyUnit, dkEnemyCityDefense] then
-        with ui do
+        with ui, NoMap do
         begin
           { Frame(offscreen.canvas,xView-1,yView-1,xView+64,yView+48,
@@ -529 +532 @@
           with offscreen.Canvas do
           begin
-            Brush.Color := GrExt[HGrSystem].Data.Canvas.Pixels[98, 67];
+            Brush.Color := HGrSystem.Data.Canvas.Pixels[98, 67];
             offscreen.Canvas.FillRect(Rect(xView, yView, xView + 64,
               yView + 16));
@@ -574 +577 @@
             Sprite(offscreen, HGrStdUnits, xView, yView, xxu * 2, yyu * 2,
               1 + 6 * (xxu * 2 + 1), 1);
-          FrameImage(offscreen.Canvas, GrExt[HGrSystem].Data, xView - 20,
+          FrameImage(offscreen.Canvas, HGrSystem.Data, xView - 20,
             yView + 5, 12, 14, 121 + Exp div ExpCost * 13, 28);
           if Health < 100 then