Changeset 460 for trunk/LocalPlayer/CityScreen.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/CityScreen.pas (modified) (11 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -6 +6 @@
 uses
   {$IFDEF UNIX}LMessages,{$ENDIF}
-  Protocol, ClientTools, Term, ScreenTools, IsoEngine, BaseWin,
-  LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
-  ButtonA, ButtonC, Area, GraphType, Texture;
+  Protocol, ClientTools, ScreenTools, IsoEngine, BaseWin, LCLIntf, LCLType,
+  Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls, ButtonA,
+  ButtonC, Area, GraphType, Texture;
 
 const
@@ -49 +49 @@
     procedure PrevCityBtnClick(Sender: TObject);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
-    // procedure AdviceBtnClick(Sender: TObject);
     procedure PageUpBtnClick(Sender: TObject);
     procedure PageDownBtnClick(Sender: TObject);
@@ -101 +100 @@
   end;
 
-var
-  CityDlg: TCityDlg;
-
 
 implementation
 
 uses
-  Select, Messg, MessgEx, Help, Tribes, Directories, Math, Sound;
+  Select, Messg, MessgEx, Help, Tribes, Directories, Math, Sound, Term;
 
 {$R *.lfm}
@@ -205 +201 @@
   AreaMap.SetPaintBounds(xmArea - 192, ymArea - 96 - 32, xmArea + 192,
     ymArea + 96);
-  SmallMapMode := smImprovements;
-  ZoomArea := 1;
+  Reset;
   ProdHint := False;
   RestoreUnFocus := -1;
@@ -1171 +1166 @@
       (X < xView + 73) and (Y < yView + 50) then
       if cGov = gAnarchy then
-        with MessgExDlg do
+        with MainScreen.MessgExDlg do
         begin
           { MessgText:=Phrases.Lookup('OUTOFCONTROL');
@@ -1204 +1199 @@
         if iix >= 0 then
           if ssShift in Shift then
-            HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkImp, iix)
+            MainScreen.HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkImp, iix)
           else if (ClientMode < scContact) then
-            with MessgExDlg do
+            with MainScreen.MessgExDlg do
             begin
               IconKind := mikImp;
@@ -1343 +1338 @@
           if C.Status and csResourceWeightsMask <> 0 then
           begin
-            with MessgExDlg do
+            with MainScreen.MessgExDlg do
             begin
               MessgText := Phrases.Lookup('CITYMANAGEOFF');
@@ -1351 +1346 @@
               ShowModal;
             end;
-            if MessgExDlg.ModalResult = mrOK then
+            if MainScreen.MessgExDlg.ModalResult = mrOK then
             begin
               MyCity[cix].Status := MyCity[cix].Status and
@@ -1450 +1445 @@
 begin
   Assert(not Supervising);
-  ModalSelectDlg.ShowNewContent_CityProject(wmModal, cix);
-  if ModalSelectDlg.Result <> -1 then
-  begin
-    if ModalSelectDlg.Result and cpType <> 0 then
+  MainScreen.ModalSelectDlg.ShowNewContent_CityProject(wmModal, cix);
+  if MainScreen.ModalSelectDlg.Result <> -1 then
+  begin
+    if MainScreen.ModalSelectDlg.Result and cpType <> 0 then
     begin
       MyCity[cix].Status := MyCity[cix].Status and not 7 or
-        (1 + ModalSelectDlg.Result and cpIndex);
-      AutoBuild(cix, MyData.ImpOrder[ModalSelectDlg.Result and cpIndex]);
+        (1 + MainScreen.ModalSelectDlg.Result and cpIndex);
+      AutoBuild(cix, MyData.ImpOrder[MainScreen.ModalSelectDlg.Result and cpIndex]);
     end
     else
     begin
-      NewProject := ModalSelectDlg.Result;
+      NewProject := MainScreen.ModalSelectDlg.Result;
       QueryOk := True;
       if (NewProject and cpImp <> 0) and (NewProject and cpIndex >= 28) and
         (MyRO.NatBuilt[NewProject and cpIndex] > 0) then
-        with MessgExDlg do
+        with MainScreen.MessgExDlg do
         begin
           cix1 := MyRO.nCity - 1;
@@ -1542 +1537 @@
   if (cix < 0) or (ClientMode >= scContact) then
     Exit;
-  with MyCity[cix], MessgExDlg do
+  with MyCity[cix], MainScreen.MessgExDlg do
   begin
     Cost := Report.ProjectCost;
@@ -1743 +1738 @@
 end;
 
-{ procedure TCityDlg.AdviceBtnClick(Sender: TObject);
-  begin
-  AdvisorDlg.GiveCityAdvice(cix);
-  end; }
-
 procedure TCityDlg.PageUpBtnClick(Sender: TObject);
 begin