Changeset 592 for trunk

Timestamp:

Aug 10, 2024, 3:40:04 PM (3 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

Files:

• AI Template/AI.pas (modified) (1 diff)
• AI Template/CustomAI.pas (modified) (2 diffs)
• AI Template/ToolAI.pas (modified) (12 diffs)
• AI/StdAI/AI.pas (modified) (1 diff)
• AI/StdAI/CustomAI.pas (modified) (2 diffs)
• AI/StdAI/StdAI.lpi (modified) (4 diffs)
• AI/StdAI/ToolAI.pas (modified) (1 diff)
• AI/StdAI/libstdai-amd64.so (modified) ( previous)
• Brain.pas (modified) (4 diffs)
• Database.pas (modified) (1 diff)
• GameServer.pas (modified) (2 diffs)
• LocalPlayer/CityScreen.pas (modified) (2 diffs)
• LocalPlayer/ClientTools.pas (modified) (1 diff)
• LocalPlayer/Nego.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (1 diff)
• Packages/Common/StopWatch.pas (modified) (2 diffs)
• Packages/DpiControls/Dpi.StdCtrls.pas (modified) (1 diff)

trunk/AI Template/AI.pas

@@ -185 +185 @@
           begin // tile is exploited, but not the city own tile -- check if improvable
             RadiusLoc := Radius[V21];
-            assert((RadiusLoc >= 0) and (RadiusLoc < MapSize));
+            Assert((RadiusLoc >= 0) and (RadiusLoc < MapSize));
             if (RadiusLoc >= 0) and (RadiusLoc < MapSize) then
             begin

trunk/AI Template/CustomAI.pas

@@ -687 +687 @@
   Result := True;
   // always returns true so that it can be used like
-  // "assert(DebugMessage(...));" -> not compiled in release build
+  // "Assert(DebugMessage(...));" -> not compiled in release build
 end;
 
@@ -696 +696 @@
   Result := True;
   // always returns true so that it can be used like
-  // "assert(SetDebugMap(...));" -> not compiled in release build
+  // "Assert(SetDebugMap(...));" -> not compiled in release build
 end;
 

trunk/AI Template/ToolAI.pas

@@ -293 +293 @@
 procedure TToolAI.JobAssignment_AddUnit(uix: integer);
 begin
-  assert(MyModel[MyUnit[uix].mix].Kind in [mkSettler, mkSlaves]);
+  Assert(MyModel[MyUnit[uix].mix].Kind in [mkSettler, mkSlaves]);
   JobLocOfSettler[uix] := ToAssign;
 end;
@@ -598 +598 @@
   MoveCost, RecoverCost: integer;
 begin
-  assert(((FromTile and fTerrain <= fMountains) or (FromTile and fTerrain = fUNKNOWN)) and
+  Assert(((FromTile and fTerrain <= fMountains) or (FromTile and fTerrain = fUNKNOWN)) and
     ((ToTile and fTerrain <= fMountains) or (ToTile and fTerrain = fUNKNOWN)));
   // do not pass location codes for FromTile and ToTile!
@@ -775 +775 @@
   end
 
-  else {if MoveStyle<msSpy+$10000000 then}
+  else {if MoveStyle < msSpy + $10000000 then}
   begin // spies
     if (ToTile + 1) and fTerrain < fGrass + 1 then
@@ -834 +834 @@
   // todo: check exit condition, e.g. whether destination reached
 
-  Reached[Loc]:=true;
+  Reached[Loc]:=True;
   V8_to_Loc(Loc, Adjacent);
   for V8:=0 to 7 do
@@ -844 +844 @@
           Pile.Put(NextLoc, NextTime+RecoverTurns*$1000);
         csForbiddenTile:
-          Reached[NextLoc]:=true; // don't check moving there again
+          Reached[NextLoc]:=True; // don't check moving there again
         csCheckTerritory:
           if RO.Territory[NextLoc]=RO.Territory[Loc] then
@@ -954 +954 @@
   i: integer;
 begin
-  assert(not InitComplete); // call order violation!
+  Assert(not InitComplete); // call order violation!
   if Map[MyUnit[uix].Loc] and fTerrain < fGrass then exit;
   for i := 0 to nTransportLoad - 1 do
-    if uix = uixTransportLoad[i] then exit;
+    if uix = uixTransportLoad[i] then Exit;
   uixTransportLoad[nTransportLoad] := uix;
   Inc(nTransportLoad);
@@ -966 +966 @@
   MoveStyle: integer;
 begin
-  assert(not InitComplete); // call order violation!
-  assert(MyModel[MyUnit[uix].mix].Cap[mcSeaTrans] > 0);
+  Assert(not InitComplete); // call order violation!
+  Assert(MyModel[MyUnit[uix].mix].Cap[mcSeaTrans] > 0);
   TransportAvailable[uix] := 1;
   with MyModel[MyUnit[uix].mix] do
@@ -983 +983 @@
 procedure TToolAI.SeaTransport_AddDestination(Loc: integer);
 begin
-  assert(not InitComplete); // call order violation!
+  Assert(not InitComplete); // call order violation!
   Pile.Put(Loc, $800);
   HaveDestinations := True;
@@ -993 +993 @@
   Adjacent: TVicinity8Loc;
 begin
-  assert(not InitComplete); // call order violation!
+  Assert(not InitComplete); // call order violation!
   InitComplete := True;
   if HaveDestinations then
@@ -1040 +1040 @@
   GroupComplete: array[0..lxmax * lymax - 1] of boolean;
 begin
-  assert(InitComplete); // call order violation!
+  Assert(InitComplete); // call order violation!
 
   if HaveDestinations and (nTransportLoad > 0) then
@@ -1054 +1054 @@
           if (abs(a) <= 1) and (abs(b) <= 1) then
           begin
-            assert((a <> 0) or (b <> 0));
+            Assert((a <> 0) or (b <> 0));
             Inc(GroupCount);
           end;
@@ -1090 +1090 @@
     for tuix := 0 to nTransportLoad - 1 do
     begin
-      assert(Map[MyUnit[uixTransportLoad[tuix]].Loc] and fTerrain >= fGrass);
+      Assert(Map[MyUnit[uixTransportLoad[tuix]].Loc] and fTerrain >= fGrass);
       f := Formation[MyUnit[uixTransportLoad[tuix]].Loc];
       if f >= 0 then Inc(Arrived[f]);

trunk/AI/StdAI/AI.pas

@@ -289 +289 @@
     end;
   end;
-  //!!!assert(Quality>0);
+  //!!!Assert(Quality > 0);
 end;
 

trunk/AI/StdAI/CustomAI.pas

@@ -687 +687 @@
   Result := True;
   // always returns true so that it can be used like
-  // "assert(DebugMessage(...));" -> not compiled in release build
+  // "Assert(DebugMessage(...));" -> not compiled in release build
 end;
 
@@ -696 +696 @@
   Result := True;
   // always returns true so that it can be used like
-  // "assert(SetDebugMap(...));" -> not compiled in release build
+  // "Assert(SetDebugMap(...));" -> not compiled in release build
 end;
 

trunk/AI/StdAI/StdAI.lpi

@@ -2 +2 @@
 <CONFIG>
   <ProjectOptions>
-    <Version Value="11"/>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
@@ -9 +9 @@
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="StdAI"/>
       <UseAppBundle Value="False"/>
@@ -40 +41 @@
             </SyntaxOptions>
           </Parsing>
-          <CodeGeneration>
-            <Optimizations>
-              <OptimizationLevel Value="3"/>
-            </Optimizations>
-          </CodeGeneration>
           <Linking>
             <Debugging>
@@ -69 +65 @@
     <RunParams>
       <FormatVersion Value="2"/>
-      <Modes Count="0"/>
     </RunParams>
     <RequiredPackages Count="1">

trunk/AI/StdAI/ToolAI.pas

@@ -652 +652 @@
   MoveCost, RecoverCost: Integer;
 begin
-  //IsCapture:=true;
+  //IsCapture := True;
   Assert(((FromTile and fTerrain <= fMountains) or (FromTile and
     fTerrain = fUNKNOWN)) and ((ToTile and fTerrain <= fMountains) or

trunk/Brain.pas

@@ -84 +84 @@
     with Picture.Canvas do begin
       Brush.Color := $904830;
-      FillRect(Rect(0, 0, 64, 64));
+      FillRect(Rect(0, 0, Picture.Width, Picture.Height));
       Font.Assign(UniFont[ftTiny]);
       Font.Style := [];
       Font.Color := $5FDBFF;
       TextSize := TextExtent(FileName);
-      TextOut(32 - TextSize.Width div 2, 32 - TextSize.Height div 2, FileName);
+      TextOut((Picture.Width - TextSize.Width) div 2,
+        (Picture.Height - TextSize.Height) div 2, FileName);
     end;
   end;
@@ -110 +111 @@
   Flags := fMultiple;
   Client := nil;
-  Initialized := false;
+  Initialized := False;
   ServerVersion := 0;
   if not FileExists(AIFileName) then
@@ -118 +119 @@
   while not EOF(T) do
   begin
-    ReadLn(T, s);
-    s := trim(s);
+    ReadLn(T, S);
+    S := Trim(s);
     if Pos(' ', S) > 0 then begin
       Key := Copy(S, 1, Pos(' ', S) - 1);
@@ -160 +161 @@
     {$ENDIF}{$ENDIF}
     else if Key = '#GAMEVERSION' then
-      for i := 1 to Length(Value) do
-        case Value[i] of
+      for I := 1 to Length(Value) do
+        case Value[I] of
           '0' .. '9':
             ServerVersion := ServerVersion and $FFFF00 + ServerVersion and
-              $FF * 10 + ord(Value[i]) - 48;
+              $FF * 10 + Ord(Value[I]) - 48;
           '.':
           ServerVersion := ServerVersion shl 8;

trunk/Database.pas

@@ -2283 +2283 @@
       Exit;
     IntServer(sIntTellAboutNation, p1, p2, nil^);
-    // NewContact[p1,p2]:=true
+    // NewContact[p1, p2] := True
   end;
 

trunk/GameServer.pas

@@ -331 +331 @@
         NullOffer.nCost := 0;
         Server(scDipOffer, pDipActive, 0, NullOffer);
-      end
-    end
+      end;
+    end;
 end;
 
@@ -1031 +1031 @@
     with RW[pTurn].City[cix] do
       if Loc >= 0 then begin
-        // if SavedResourceWeights[cix] <> ResourceWeights then Result := true;
+        // if SavedResourceWeights[cix] <> ResourceWeights then Result := True;
         if SavedTiles[cix] <> Tiles then begin
           Result := True;

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;

trunk/Packages/Common/StopWatch.pas

@@ -22 +22 @@
     function GetElapsed: string;
   public
-    constructor Create(const startOnCreate : Boolean = False) ;
+    constructor Create(const startOnCreate: Boolean = False) ;
     procedure Start;
     procedure Stop;
@@ -35 +35 @@
 implementation
 
-constructor TStopWatch.Create(const startOnCreate : boolean = false) ;
+constructor TStopWatch.Create(const startOnCreate: Boolean = False) ;
 begin
   inherited Create;

trunk/Packages/DpiControls/Dpi.StdCtrls.pas

@@ -158 +158 @@
     property ItemHeight: Integer read GetItemHeight write SetItemHeight;
     property IntegralHeight: Boolean read GetIntegralHeight write SetIntegralHeight default False;
-    property ExtendedSelect: Boolean read GetExtendedSelect write SetExtendedSelect default true;
+    property ExtendedSelect: Boolean read GetExtendedSelect write SetExtendedSelect default True;
     property BorderStyle: TBorderStyle read GetBorderStyle write SetBorderStyle default bsNone;
     property Visible;