Changeset 592 for trunk/LocalPlayer

Timestamp:

Aug 10, 2024, 3:40:04 PM (4 months ago)

Author:

chronos

Message:

• Fixed: Avoided more GTK2 chrashes.
• Fixed: Build StdAI with O1 optimization level to avoid crash.
• Modified: Code cleanup.

Location:

trunk/LocalPlayer

Files:

• CityScreen.pas (modified) (2 diffs)
• ClientTools.pas (modified) (1 diff)
• Nego.pas (modified) (1 diff)
• Term.pas (modified) (1 diff)

trunk/LocalPlayer/CityScreen.pas

@@ -1472 +1472 @@
           IconKind := mikImp;
           IconIndex := NewProject and cpIndex;
+          Gtk2Fix;
           ShowModal;
           QueryOk := ModalResult = mrOK;
@@ -1512 +1513 @@
         (MyCity[cix].Size < 3) and
         ((MyModel[NewProject and cpIndex].Kind = mkSlaves) or
-        (NewProject and cpConscripts <> 0))) then
-        if SimpleQuery(mkYesNo, Phrases.Lookup('EMIGRATE'), 'MSG_DEFAULT') <> mrOK
-        then
-          NewProject := NewProject or cpDisbandCity;
+        (NewProject and cpConscripts <> 0))) then begin
+          Gtk2Fix;
+          if SimpleQuery(mkYesNo, Phrases.Lookup('EMIGRATE'), 'MSG_DEFAULT') <> mrOK then
+            NewProject := NewProject or cpDisbandCity;
+        end;
       Server(sSetCityProject, Me, cix, NewProject);
       C.Project := MyCity[cix].Project;

trunk/LocalPlayer/ClientTools.pas

@@ -601 +601 @@
               // TODO: What is this assert for?
               // Need to optimize city tiles but CheckOnly true?
-              //assert(false)
+              //Assert(false)
             end
             else

trunk/LocalPlayer/Nego.pas

@@ -875 +875 @@
           InputDlg.EditInput.Text := '';
           InputDlg.CenterToRect(BoundsRect);
+          Gtk2Fix;
           InputDlg.ShowModal;
           if InputDlg.ModalResult <> mrOK then

trunk/LocalPlayer/Term.pas

@@ -7573 +7573 @@
       or (MyRO.TestFlags and (tfAllTechs or tfUncover or tfAllContact) <> 0);
     mEUnitStat.Enabled := MyRO.nEnemyModel > 0;
-    { mWonders.Enabled:= false;
-      for I:=0 to nWonder - 1 do if MyRO.Wonder[I].CityID <> WonderNotBuiltYet then
-      mWonders.Enabled:=True; }
+    { mWonders.Enabled:= False;
+      for I := 0 to nWonder - 1 do if MyRO.Wonder[I].CityID <> WonderNotBuiltYet then
+      mWonders.Enabled := True; }
     mDiagram.Enabled := MyRO.Turn >= 2;
     mShips.Enabled := False;