Changeset 460 for trunk/LocalPlayer/UnitStat.pas

Timestamp:

Nov 28, 2023, 3:16:24 PM (12 months ago)

Author:

chronos

Message:

• Modified: Do not initialize all local player windows at the start of the game but later when they are really opened. This also fixes window initialization under Qt5 widgetset.

File:

• trunk/LocalPlayer/UnitStat.pas (modified) (16 diffs)

trunk/LocalPlayer/UnitStat.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, Term, ScreenTools, BaseWin,
-  LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
-  ButtonB, ButtonC, IsoEngine;
+  Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
+  Classes, Graphics, Controls, Forms, ButtonB, ButtonC, IsoEngine;
 
 type
+  TUnitStatDialogKind = (dkOwnModel, dkOwnUnit, dkEnemyModel, dkEnemyUnit,
+    dkEnemyCityDefense, dkEnemyCity);
+
   TUnitStatDlg = class(TBufferedDrawDlg)
     SwitchBtn: TButtonB;
@@ -26 +28 @@
   private
     NoMap: TIsoMap;
+  protected
+    mixShow, // for dkOwnModel
+    uixShow, euixShow, ecixShow, UnitLoc, AgePrepared: Integer;
+    // for dkEnemyUnit, euixShow=-1 ->
+    mox: ^TModelInfo; // for dkEnemyModel
+    Kind: TUnitStatDialogKind;
+    Back: TBitmap;
+    Template: TBitmap;
+    procedure OffscreenPaint; override;
   public
     procedure CheckAge;
@@ -34 +45 @@
     procedure ShowNewContent_EnemyModel(NewMode: TWindowMode; emix: Integer);
     procedure ShowNewContent_EnemyCity(NewMode: TWindowMode; Loc: Integer);
-
-  protected
-    mixShow, // for dkOwnModel
-    uixShow, euixShow, ecixShow, UnitLoc, AgePrepared: Integer;
-    // for dkEnemyUnit, euixShow=-1 ->
-    mox: ^TModelInfo; // for dkEnemyModel
-    Kind: (dkOwnModel, dkOwnUnit, dkEnemyModel, dkEnemyUnit, dkEnemyCityDefense,
-      dkEnemyCity);
-    Back, Template: TBitmap;
-    procedure OffscreenPaint; override;
-  end;
-
-var
-  UnitStatDlg: TUnitStatDlg;
+  end;
+
 
 implementation
 
 uses
-  Tribes, Help, Directories, Texture;
+  Term, Tribes, Help, Directories, Texture;
 
 {$R *.lfm}
@@ -82 +81 @@
   Back.PixelFormat := pf24bit;
   Back.SetSize(5 * wCommon, hMax);
-  Back.Canvas.FillRect(0, 0, Back.Width,Back.Height);
+  Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
   Template := TBitmap.Create;
   Template.PixelFormat := pf24bit;
@@ -121 +120 @@
 procedure TUnitStatDlg.FormShow(Sender: TObject);
 var
-  owner, mix: Integer;
+  Owner, mix: Integer;
   IsSpecialUnit: Boolean;
 begin
@@ -138 +137 @@
       begin
         mox := @MyRO.EnemyModel[emix];
-        if not Assigned(Tribe[owner].ModelPicture[mix].HGr) then
+        if not Assigned(Tribe[Owner].ModelPicture[mix].HGr) then
           InitEnemyModel(emix);
-      end
+      end;
     end
     else
@@ -153 +152 @@
   end;
   case Kind of
-    dkOwnModel:
-      ClientHeight := hOwnModel;
-    dkOwnUnit:
-      ClientHeight := hEnemyUnit;
-    dkEnemyModel:
-      ClientHeight := hEnemyModel;
-    dkEnemyUnit:
-      ClientHeight := hEnemyUnit;
-    dkEnemyCityDefense:
-      ClientHeight := hEnemyCityDefense;
-    dkEnemyCity:
-      ClientHeight := hEnemyCity;
+    dkOwnModel: ClientHeight := hOwnModel;
+    dkOwnUnit: ClientHeight := hEnemyUnit;
+    dkEnemyModel: ClientHeight := hEnemyModel;
+    dkEnemyUnit: ClientHeight := hEnemyUnit;
+    dkEnemyCityDefense: ClientHeight := hEnemyCityDefense;
+    dkEnemyCity: ClientHeight := hEnemyCity;
   end;
 
@@ -171 +164 @@
     Left := UserLeft;
     Top := UserTop;
-  end
-  else
-  begin
+  end else begin
     Left := (Screen.Width - Width) div 2;
     Top := (Screen.Height - Height) div 2;
@@ -188 +179 @@
   begin
     case Kind of
-      dkOwnModel:
-        begin
-          owner := Me;
-          mix := mixShow;
-          IsSpecialUnit := MyModel[mix].Kind >= $10;
-        end;
-      dkOwnUnit:
-        begin
-          owner := Me;
-          mix := MyUn[uixShow].mix;
-          IsSpecialUnit := MyModel[mix].Kind >= $10;
-        end
-    else
-      begin
-        owner := mox.owner;
+      dkOwnModel: begin
+        Owner := Me;
+        mix := mixShow;
+        IsSpecialUnit := MyModel[mix].Kind >= $10;
+      end;
+      dkOwnUnit: begin
+        Owner := Me;
+        mix := MyUn[uixShow].mix;
+        IsSpecialUnit := MyModel[mix].Kind >= $10;
+      end;
+      else begin
+        Owner := mox.Owner;
         mix := mox.mix;
         IsSpecialUnit := mox.Kind >= $10;
@@ -271 +259 @@
   begin
     UserLeft := Left;
-    UserTop := Top
-  end;
-  if OffscreenUser = self then
+    UserTop := Top;
+  end;
+  if OffscreenUser = Self then
     OffscreenUser := nil;
 end;
@@ -343 +331 @@
             mcFirstNonCap .. nFeature - 1:
               if mi.Cap and (1 shl (I - mcFirstNonCap)) <> 0 then
-                num := 1
+                num := 1;
           end;
           if (num > 0) and
@@ -357 +345 @@
               Brush.Style := bsClear;
               Textout(X - 3 + dx + 1, Y, S);
-              Inc(dx, W + 1)
+              Inc(dx, W + 1);
             end;
             Brush.Color := $C0C0C0;
@@ -364 +352 @@
             Sprite(dst, HGrSystem, X - 1 + dx, Y + 4, 10, 10,
               66 + I mod 11 * 11, 137 + I div 11 * 11);
-            Inc(dx, 15)
+            Inc(dx, 15);
           end;
         end;
       end;
-  end; { featurebar }
+  end;
 
   procedure NumberBarS(dst: TBitmap; X, Y: Integer; Cap, S: string; T: TTexture);
@@ -387 +375 @@
 
   case Kind of
-    dkOwnModel:
-      begin
-        BitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hOwnModel,
-          Back.Canvas, 0, 0);
-        yView := 13;
-        yTotal := 92;
-      end;
-    dkEnemyModel:
-      begin
-        BitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyModel,
-          Back.Canvas, wCommon, 0);
-        yView := 13;
-        yTotal := 92;
-      end;
-    dkEnemyUnit, dkOwnUnit:
-      begin
-        BitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyUnit,
-          Back.Canvas, 2 * wCommon, 0);
-        yView := 13;
-        yTotal := 123;
-      end;
-    dkEnemyCityDefense:
-      begin
-        BitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyCityDefense,
-          Back.Canvas, 3 * wCommon, 0);
-        yView := 171;
-        yTotal := 231;
-      end;
-    dkEnemyCity:
-      begin
-        BitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyCity,
-          Back.Canvas, 4 * wCommon, 0);
-      end;
+    dkOwnModel: begin
+      BitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hOwnModel,
+        Back.Canvas, 0, 0);
+      yView := 13;
+      yTotal := 92;
+    end;
+    dkEnemyModel: begin
+      BitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyModel,
+        Back.Canvas, wCommon, 0);
+      yView := 13;
+      yTotal := 92;
+    end;
+    dkEnemyUnit, dkOwnUnit: begin
+      BitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyUnit,
+        Back.Canvas, 2 * wCommon, 0);
+      yView := 13;
+      yTotal := 123;
+    end;
+    dkEnemyCityDefense: begin
+      BitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyCityDefense,
+        Back.Canvas, 3 * wCommon, 0);
+      yView := 171;
+      yTotal := 231;
+    end;
+    dkEnemyCity: begin
+      BitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyCity,
+        Back.Canvas, 4 * wCommon, 0);
+    end;
   end;
   MarkUsedOffscreen(ClientWidth, ClientHeight);
@@ -438 +421 @@
           1: J := imCoastalFort;
           2: J := imMissileBat;
-          3: J := imBunker
+          3: J := imBunker;
         end;
         Frame(Offscreen.Canvas, X - 1, yImp - 1, X + xSizeSmall,
@@ -734 +717 @@
 procedure TUnitStatDlg.HelpBtnClick(Sender: TObject);
 begin
-  HelpDlg.ShowNewContent(wmPersistent, hkModel, 0);
+  MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkModel, 0);
 end;