Changeset 460 for trunk/LocalPlayer/Select.pas

Timestamp:

Nov 28, 2023, 3:16:24 PM (6 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/Select.pas (modified) (6 diffs)

trunk/LocalPlayer/Select.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, Term, ScreenTools, PVSB, BaseWin,
+  Protocol, ClientTools, ScreenTools, PVSB, BaseWin,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
   ExtCtrls, ButtonB, ButtonBase, Menus, Types;
@@ -92 +92 @@
   adAll = $10000;
 
-var
-  ListDlg: TListDlg;
-  ModalSelectDlg: TModalSelectDlg;
-
 
 implementation
 
 uses
-  CityScreen, Help, UnitStat, Tribes, Inp, CmdList;
+  Term, CityScreen, Help, UnitStat, Tribes, Inp, CmdList;
 
 {$R *.lfm}
@@ -871 +867 @@
     Server(CommandWithData(cSetCityName, CityNameInfo.GetCommandDataSize),
       Me, 0, CityNameInfo);
-    if CityDlg.Visible then
+    if MainScreen.CityDlg.Visible then
     begin
-      CityDlg.FormShow(nil);
-      CityDlg.Invalidate;
+      MainScreen.CityDlg.FormShow(nil);
+      MainScreen.CityDlg.Invalidate;
     end;
     Result := True;
@@ -900 +896 @@
     Server(CommandWithData(cSetModelName, ModelNameInfo.GetCommandDataSize),
       Me, 0, ModelNameInfo);
-    if UnitStatDlg.Visible then
+    if MainScreen.UnitStatDlg.Visible then
     begin
-      UnitStatDlg.FormShow(nil);
-      UnitStatDlg.Invalidate;
+      MainScreen.UnitStatDlg.FormShow(nil);
+      MainScreen.UnitStatDlg.Invalidate;
     end;
     Result := True;
@@ -941 +937 @@
         kModels, kChooseModel:
           if lix <> mixAll then
-            UnitStatDlg.ShowNewContent_OwnModel(wmPersistent, lix);
+            MainScreen.UnitStatDlg.ShowNewContent_OwnModel(wmPersistent, lix);
         kEModels:
-          UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent,
+          MainScreen.UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent,
             Code[1, ScrollBar.Position + Selected]);
         kAllEModels, kChooseEModel:
           if lix <> mixAll then
-            UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent, lix);
+            MainScreen.UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent, lix);
         kAdvance, kFarAdvance, kScience, kChooseTech, kChooseETech, kStealTech:
           if lix = adMilitary then
-            HelpDlg.ShowNewContent(wmPersistent, hkText,
-              HelpDlg.TextIndex('MILRES'))
+            MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkText,
+              MainScreen.HelpDlg.TextIndex('MILRES'))
           else if lix < adMilitary then
-            HelpDlg.ShowNewContent(wmPersistent, hkAdv, lix);
+            MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkAdv, lix);
         kProject:
           if lix = cpImp + imTrGoods then
-            HelpDlg.ShowNewContent(wmPersistent, hkText,
-              HelpDlg.TextIndex('TRADINGGOODS'))
+            MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkText,
+              MainScreen.HelpDlg.TextIndex('TRADINGGOODS'))
           else if lix and (cpImp + cpType) = 0 then
-            UnitStatDlg.ShowNewContent_OwnModel(wmPersistent,
+            MainScreen.UnitStatDlg.ShowNewContent_OwnModel(wmPersistent,
               lix and cpIndex)
           else if (lix and cpType = 0) and (lix <> cpImp + imTrGoods) then
-            HelpDlg.ShowNewContent(wmPersistent, hkImp,
+            MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkImp,
               lix and cpIndex);
         kGov:
-          HelpDlg.ShowNewContent(wmPersistent, hkMisc,
+          MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkMisc,
             Integer(miscGovList));
         kShipPart, kEShipPart:
@@ -1887 +1883 @@
 procedure TListDlg.RemoveUnit;
 begin
-  if ListDlg.Visible and (Kind = kModels) then
+  if Visible and (Kind = kModels) then
     SmartUpdateContent;
 end;