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

trunk/LocalPlayer/Nego.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, BaseWin, Protocol, Term, LCLType, SysUtils, Classes, Graphics,
+  ScreenTools, BaseWin, Protocol, LCLType, SysUtils, Classes, Graphics,
   Controls, Forms, ButtonA, ButtonB, ButtonN;
 
@@ -20 +20 @@
 
   TCommandAllowedEnum = scDipNoticeStart..scDipBreakStart;
+  TPriceSet = set of $00..$FF;
 
   { TNegoDlg }
@@ -69 +70 @@
     procedure OfferClick(Sender: TObject);
     procedure FastBtnClick(Sender: TObject);
-
   public
     procedure Initiate; // first turn of negotiation, initiate
@@ -76 +76 @@
     procedure OffscreenPaint; override;
     procedure ShowNewContent(NewMode: TWindowMode);
-
   private
     Page, DipCommand: Integer;
@@ -93 +92 @@
   end;
 
-var
-  NegoDlg: TNegoDlg;
-
 
 implementation
 
 uses
-  Messg, ClientTools, Diplomacy, Inp, Select, NatStat, Tribes, MessgEx;
+  Messg, ClientTools, Diplomacy, Inp, Select, NatStat, Tribes, MessgEx, Term;
 
 {$R *.lfm}
@@ -392 +388 @@
   else
   begin
-    if ModalSelectDlg.OnlyChoice(kChooseModel) <> mixAll then
+    if MainScreen.ModalSelectDlg.OnlyChoice(kChooseModel) <> mixAll then
       MyAllowed := MyAllowed + [opAllModel shr 24];
-    if ModalSelectDlg.OnlyChoice(kChooseEModel) <> mixAll then
+    if MainScreen.ModalSelectDlg.OnlyChoice(kChooseEModel) <> mixAll then
       OppoAllowed := OppoAllowed + [opAllModel shr 24];
   end;
@@ -649 +645 @@
   if (X >= xNationPicture0) and (X < xNationPicture0 + 64) and
     (Y >= yNationPicture) and (Y < yNationPicture + 48) then
-    NatStatDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), DipMem[Me].pContact)
+    MainScreen.NatStatDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), DipMem[Me].pContact)
   else if (X >= xNationPicture1) and (X < xNationPicture1 + 64) and
     (Y >= yNationPicture) and (Y < yNationPicture + 48) then
-    NatStatDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), Me)
+    MainScreen.NatStatDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), Me)
 end;
 
@@ -756 +752 @@
         begin // choose type and number
           if MyRO.NatBuilt[imSpacePort] = 0 then
-            with MessgExDlg do
+            with MainScreen.MessgExDlg do
             begin
               OpenSound := 'WARNING_LOWSUPPORT';
@@ -767 +763 @@
                 Exit;
             end;
-          ModalSelectDlg.ShowNewContent(wmModal, kEShipPart);
-          if ModalSelectDlg.Result < 0 then
-            Exit;
-          Inc(Price, ModalSelectDlg.Result shl 16);
-          Max := MyRO.Ship[DipMem[Me].pContact].Parts[ModalSelectDlg.Result];
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kEShipPart);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          Inc(Price, MainScreen.ModalSelectDlg.Result shl 16);
+          Max := MyRO.Ship[DipMem[Me].pContact].Parts[MainScreen.ModalSelectDlg.Result];
           InputDlg.Caption := Phrases.Lookup('TITLE_NUMBER');
           InputDlg.EInput.Text := '';
@@ -789 +785 @@
       opAllTech:
         begin // choose technology
-          ModalSelectDlg.ShowNewContent(wmModal, kChooseETech);
-          if ModalSelectDlg.Result < 0 then
-            Exit;
-          if ModalSelectDlg.Result = adAll then
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseETech);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          if MainScreen.ModalSelectDlg.Result = adAll then
             Price := opAllTech
           else
-            Price := OpTech + ModalSelectDlg.Result;
+            Price := OpTech + MainScreen.ModalSelectDlg.Result;
         end;
       opAllModel:
         begin // choose model
-          ModalSelectDlg.ShowNewContent(wmModal, kChooseEModel);
-          if ModalSelectDlg.Result < 0 then
-            Exit;
-          if ModalSelectDlg.Result = mixAll then
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseEModel);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          if MainScreen.ModalSelectDlg.Result = mixAll then
             Price := opAllModel
           else
-            Price := OpModel + MyRO.EnemyModel[ModalSelectDlg.Result].mix;
+            Price := OpModel + MyRO.EnemyModel[MainScreen.ModalSelectDlg.Result].mix;
         end;
       opTreaty:
@@ -869 +865 @@
       opShipParts:
         begin // choose type and number
-          ModalSelectDlg.ShowNewContent(wmModal, kShipPart);
-          if ModalSelectDlg.Result < 0 then
-            Exit;
-          Inc(Price, ModalSelectDlg.Result shl 16);
-          Max := MyRO.Ship[Me].Parts[ModalSelectDlg.Result];
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kShipPart);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          Inc(Price, MainScreen.ModalSelectDlg.Result shl 16);
+          Max := MyRO.Ship[Me].Parts[MainScreen.ModalSelectDlg.Result];
           InputDlg.Caption := Phrases.Lookup('TITLE_NUMBER');
           InputDlg.EInput.Text := '';
@@ -891 +887 @@
       opAllTech:
         begin // choose technology
-          ModalSelectDlg.ShowNewContent(wmModal, kChooseTech);
-          if ModalSelectDlg.Result < 0 then
-            Exit;
-          if ModalSelectDlg.Result = adAll then
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseTech);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          if MainScreen.ModalSelectDlg.Result = adAll then
             Price := opAllTech
           else
-            Price := OpTech + ModalSelectDlg.Result;
+            Price := OpTech + MainScreen.ModalSelectDlg.Result;
         end;
       opAllModel:
         begin // choose model
-          ModalSelectDlg.ShowNewContent(wmModal, kChooseModel);
-          if ModalSelectDlg.Result < 0 then
-            Exit;
-          if ModalSelectDlg.Result = mixAll then
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseModel);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          if MainScreen.ModalSelectDlg.Result = mixAll then
             Price := opAllModel
           else
-            Price := OpModel + ModalSelectDlg.Result;
+            Price := OpModel + MainScreen.ModalSelectDlg.Result;
         end;
       opTreaty: