Changeset 549 for trunk/AI

Timestamp:

Apr 21, 2024, 8:55:53 PM (7 months ago)

Author:

chronos

Message:

• Modified: Optimize code with earlier break from for cycle evaluating boolean result.
• Modified: Code cleanup.

Location:

trunk/AI/StdAI

Files:

• AI.pas (modified) (9 diffs)
• Barbarina.pas (modified) (11 diffs)

trunk/AI/StdAI/AI.pas

@@ -1788 +1788 @@
   DistrictNeed, DistrictNeed0: array[0..maxCOD - 1] of Integer;
   ModelOrder: array[0..nMmax - 1] of Integer;
-  complete, Fortified: Boolean;
+  Complete, Fortified: Boolean;
 
   function IsBombarded(cix: Integer): Boolean;
@@ -1953 +1953 @@
             end;
 
-      complete := Loop >= FirstSurplusLoop[Cat];
+      Complete := Loop >= FirstSurplusLoop[Cat];
       for I := nModelOrder - 1 downto 0 do
       begin
@@ -1967 +1967 @@
                   Dec(DistrictNeed[District[Loc]]);
                 Destination[uix] := Loc;
-                complete := False;
+                Complete := False;
               end;
 
@@ -1980 +1980 @@
                 FindDestination(uix);
                 if Destination[uix] >= 0 then
-                  complete := False;
+                  Complete := False;
               end;
       end;
       Inc(Loop)
-    until complete;
+    until Complete;
   end;
 
@@ -2005 +2005 @@
     DistrictNeed0 := DistrictNeed;
 
-    complete := True;
+    Complete := True;
     for uix := 0 to RO.nUn - 1 do
       with MyUnit[uix] do
@@ -2015 +2015 @@
             begin
               if DistrictNeed0[District[Loc]] > 0 then
-                complete := False;
+                Complete := False;
             end
             else
@@ -2021 +2021 @@
               FindDestination(uix);
               //          if (Destination[uix]<0) and (RO.Territory[Loc]=me) then
-              //            complete:=false; // causes hangup when unit can't move due to zoc
+              //            Complete:=false; // causes hangup when unit can't move due to zoc
             end;
-  until complete;
+  until Complete;
 
   for uix := 0 to RO.nUn - 1 do
@@ -2044 +2044 @@
         case ModelCat[mix] of
           mctGroundDefender, mctGroundAttacker:
-            Dec(UnitLack[District[Loc], ModelCat[mix]])
+            Dec(UnitLack[District[Loc], ModelCat[mix]]);
         end;
 end;
@@ -2351 +2351 @@
             F := Formation[AdjacentLoc];
             if (F >= 0) and (F < maxCOD) and (OceanPresence[F] and
-              not (1 shl Me) <> 0) then
-              Result := True;
+              not (1 shl Me) <> 0) then begin
+                Result := True;
+                Exit;
+              end;
           end;
         end;

trunk/AI/StdAI/Barbarina.pas

@@ -218 +218 @@
     Result := True;
     for cix := 0 to RO.nCity - 1 do
-      with MyCity[cix] do
+      with MyCity[cix] do begin
         if Loc >= 0 then
         begin // search for modern resource
@@ -225 +225 @@
           begin
             Loc1 := Radius[V21];
-            if (Loc1 >= 0) and (RO.Map[Loc1] and fModern <> 0) then
+            if (Loc1 >= 0) and (RO.Map[Loc1] and fModern <> 0) then begin
               Result := False;
-          end;
-        end;
+              Break;
+            end;
+          end;
+        end;
+        if not Result then Break;
+      end;
   end
   else if IsResearched(adGunPowder) then
@@ -892 +896 @@
     for F := 0 to maxCOD - 1 do
       if (F < nContinent) and (ContinentPresence[F] and not
-        (1 shl Me or PresenceUnknown) <> 0) then
-        Go := True; // any enemy island known?
+        (1 shl Me or PresenceUnknown) <> 0) then begin
+          Go := True; // any enemy island known?
+          Break;
+        end;
     if not Go then
       Exit;
@@ -922 +928 @@
               (TroopLoad = 0) and (Health = 100) then
             begin
-              go := True;
+              Go := True;
               SeaTransport_AddTransport(uix);
             end;
@@ -1170 +1176 @@
           if MyUnit[uix].Loc >= 0 then
             RateAttack(uix);
-        end
-      until BackToStart
+        end;
+      until BackToStart;
     until not BackToStart;
 
@@ -1214 +1220 @@
   function LowPriority(cix: Integer): Boolean;
   var
-    part, cixHighPriority, TestDistance: Integer;
+    Part, cixHighPriority, TestDistance: Integer;
   begin
     Result := False;
-    for part := 0 to nShipPart - 1 do
+    for Part := 0 to nShipPart - 1 do
     begin
-      cixHighPriority := ColonyShipPlan[part].cixProducing;
+      cixHighPriority := ColonyShipPlan[Part].cixProducing;
       if (cixHighPriority >= 0) and (cixHighPriority <> cix) then
       begin
@@ -1375 +1381 @@
   for cix := 0 to RO.nCity - 1 do
     with MyCity[cix] do
-      if (Loc >= 0) and (Project and (cpImp + cpIndex) = cpImp + imAlgae) then
+      if (Loc >= 0) and (Project and (cpImp + cpIndex) = cpImp + imAlgae) then begin
         AlgaeAvailable := False;
+        Break;
+      end;
 
   for cix := 0 to RO.nCity - 1 do
@@ -1494 +1502 @@
                 with MyUnit[uix] do
                   if (Loc >= 0) and (Home = cix) and
-                    (MyModel[mix].Kind = mkSettler) then
-                    HasSettler := True;
+                    (MyModel[mix].Kind = mkSettler) then begin
+                      HasSettler := True;
+                      Break;
+                    end;
               if ((RO.Government <> gDespotism) or (RO.nUn >= RO.nCity * 4)) and
                 not IsResearched(adMassProduction) and (Built[imPalace] > 0) and
@@ -1552 +1562 @@
                 ImportantCity := WillProduceColonyShip or (Built[imPalace] > 0);
                 for iix := 0 to nWonder - 1 do
-                  if Built[iix] > 0 then
+                  if Built[iix] > 0 then begin
                     ImportantCity := True;
+                    Break;
+                  end;
                 City_GetReportNew(cix, Report);
                 if (Report.Corruption >= 6) and (RO.nUn >= RO.nCity * 4) and
@@ -1697 +1709 @@
           for I := 0 to nFeature - 1 do
             if (Cap[I] > 0) and (Feature[I].Preq <> preNone) and
-              ((Feature[I].Preq < 0) or not IsResearched(Feature[I].Preq)) then
-              Ready := False;
+              ((Feature[I].Preq < 0) or not IsResearched(Feature[I].Preq)) then begin
+                Ready := False;
+                Break;
+              end;
         if Ready then
         begin
           for I := 0 to nUpgrade - 1 do
             if (Upgrades and (1 shl I) <> 0) and not
-              IsResearched(Upgrade[Domain, I].Preq) then
-              Ready := False;
+              IsResearched(Upgrade[Domain, I].Preq) then begin
+                Ready := False;
+                Break;
+              end;
         end;
         if Ready then
@@ -1911 +1927 @@
     for Part := 0 to nShipPart - 1 do
       if (RO.Ship[Me].Parts[Part] < ShipNeed[Part]) // not enough of this kind already
-        and (ColonyShipPlan[Part].cixProducing < 0) then // no city to produce
-        Check := True;
+        and (ColonyShipPlan[Part].cixProducing < 0) then begin // no city to produce
+          Check := True;
+          Break;
+        end;
     if Check then
     begin