Changeset 592 for trunk/AI Template

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/AI Template

Files:

• AI.pas (modified) (1 diff)
• CustomAI.pas (modified) (2 diffs)
• ToolAI.pas (modified) (12 diffs)

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]);