Changeset 549 for trunk

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

Files:

• AI/StdAI/AI.pas (modified) (9 diffs)
• AI/StdAI/Barbarina.pas (modified) (11 diffs)
• CityProcessing.pas (modified) (1 diff)
• Database.pas (modified) (2 diffs)
• GameServer.pas (modified) (25 diffs)
• LocalPlayer/CityScreen.pas (modified) (2 diffs)
• LocalPlayer/ClientTools.pas (modified) (4 diffs)
• LocalPlayer/Draft.pas (modified) (4 diffs)
• LocalPlayer/Help.pas (modified) (3 diffs)
• LocalPlayer/IsoEngine.pas (modified) (8 diffs)
• LocalPlayer/NatStat.pas (modified) (1 diff)
• LocalPlayer/Nego.pas (modified) (1 diff)
• LocalPlayer/Select.pas (modified) (7 diffs)
• LocalPlayer/Term.pas (modified) (12 diffs)
• NoTerm.pas (modified) (1 diff)

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

trunk/CityProcessing.pas

@@ -1605 +1605 @@
                 RareOK := False;
                 for iH := 0 to nHierarchy - 1 do
-                  if Hierarchy[iH, nSelection[iH]].V21 and RareTiles <> 0 then
+                  if Hierarchy[iH, nSelection[iH]].V21 and RareTiles <> 0 then begin
                     RareOK := True;
+                    Break;
+                  end;
                 if not RareOK then
                   TestReport.ProdRep := TestReport.Support;

trunk/Database.pas

@@ -1036 +1036 @@
         begin
           Loc1 := dLoc(Loc, Dir and 1 * 2 - 1, Dir shr 1 * 2 - 1);
-          if (Loc1 >= 0) and (RealMap[Loc1] and fTerrain < fGrass) then
+          if (Loc1 >= 0) and (RealMap[Loc1] and fTerrain < fGrass) then begin
             OneTileLake := False;
+            Break;
+          end;
         end;
         if not OneTileLake then
@@ -1416 +1418 @@
     Ok := True;
     for C := 1 to nsc do
-      if nCityLoc[C] < sccount[C] * (8 - MinGood) div (7 - MinGood) then
+      if nCityLoc[C] < sccount[C] * (8 - MinGood) div (7 - MinGood) then begin
         Ok := False;
+        Break;
+      end;
   until Ok;
 

trunk/GameServer.pas

@@ -474 +474 @@
   for ix := 0 to RW[P].nUn - 1 do
     with RW[P].Un[ix] do
-      if (Loc >= 0) and (SavedStatus <> Status) then
+      if (Loc >= 0) and (SavedStatus <> Status) then begin
         Result := True;
+        Exit;
+      end;
   for ix := 0 to RW[P].nCity - 1 do
     with RW[P].City[ix] do
-      if (Loc >= 0) and (SavedStatus <> Status) then
+      if (Loc >= 0) and (SavedStatus <> Status) then begin
         Result := True;
+        Exit;
+      end;
   for ix := 0 to RW[P].nModel - 1 do
     with RW[P].Model[ix] do
-      if SavedStatus <> Status then
+      if SavedStatus <> Status then begin
         Result := True;
+        Exit;
+      end;
   for ix := 0 to RW[P].nEnemyCity - 1 do
     with RW[P].EnemyCity[ix] do
-      if (Loc >= 0) and (SavedStatus <> Status) then
+      if (Loc >= 0) and (SavedStatus <> Status) then begin
         Result := True;
+        Exit;
+      end;
   if RW[P].Data <> nil then
     for ix := 0 to bix[P].DataSize - 1 do
-      if PDWortList(SavedData[P])[ix] <> PDWortList(RW[P].Data)[ix] then
+      if PDWortList(SavedData[P])[ix] <> PDWortList(RW[P].Data)[ix] then begin
         Result := True;
+        Exit;
+      end;
 end;
 
@@ -1069 +1079 @@
   for cix := 0 to RW[pTurn].nCity - 1 do
     with RW[pTurn].City[cix] do
-      if Loc >= 0 then
-      begin
-        // if SavedResourceWeights[cix]<>ResourceWeights then result:=true;
-        if SavedTiles[cix] <> Tiles then
+      if Loc >= 0 then begin
+        // if SavedResourceWeights[cix] <> ResourceWeights then Result := true;
+        if SavedTiles[cix] <> Tiles then begin
           Result := True;
+          Break;
+        end;
       end;
 end;
@@ -1204 +1215 @@
     Notify(ntLoadBegin);
 
-  started := False;
+  Started := False;
   StatRequest := False;
   MovieStopped := False;
@@ -1224 +1235 @@
     end;
     // complete all internal commands following an sTurn before generating statistics
-    if (Command = sTurn) and not started then
+    if (Command = sTurn) and not Started then
     begin
 {$IFDEF TEXTLOG}WriteLn(TextLog, '---Turn 0 P0---'); {$ENDIF}
@@ -1237 +1248 @@
       end;
       StatRequest := True;
-      started := True;
+      Started := True;
     end
     else if (Command = sTurn) and (pTurn = 0) and (GTurn = LoadTurn) then
@@ -1283 +1294 @@
   if StatRequest then
     GenerateStat(pTurn);
-  Assert(started);
+  Assert(Started);
 {$IFDEF TEXTLOG}CloseFile(TextLog); {$ENDIF}
 {$IFDEF LOADPERF}QueryPerformanceCounter(time_total); { time in s is: (time_total-time_total0)/PerfFreq }{$ENDIF}
@@ -1499 +1510 @@
 procedure DestroyCity_TellPlayers(P, cix: Integer; SaveUnits: Boolean);
 begin
-  if RW[P].City[cix].built[imSpacePort] > 0 then
+  if RW[P].City[cix].Built[imSpacePort] > 0 then
     DestroySpacePort_TellPlayers(P, -1);
   DestroyCity(P, cix, SaveUnits);
@@ -1506 +1517 @@
 procedure ChangeCityOwner_TellPlayers(pOld, cixOld, pNew: Integer);
 begin
-  if RW[pOld].City[cixOld].built[imSpacePort] > 0 then
+  if RW[pOld].City[cixOld].Built[imSpacePort] > 0 then
     if RW[pNew].NatBuilt[imSpacePort] > 0 then
       DestroySpacePort_TellPlayers(pOld, pNew)
@@ -1521 +1532 @@
   ShipComplete := True;
   for I := 0 to nShipPart - 1 do
-    if GShip[P].Parts[I] < ShipNeed[I] then
+    if GShip[P].Parts[I] < ShipNeed[I] then begin
       ShipComplete := False;
+      Break;
+    end;
   if ShipComplete then
     GWinner := GWinner or 1 shl P; // game won!
@@ -1587 +1600 @@
             for cix := 1 to nCity - 1 do
               if (City[cix].Loc >= 0) and
-                ((Loc1 < 0) or (City[cix].built[imPalace] > 0)) then
+                ((Loc1 < 0) or (City[cix].Built[imPalace] > 0)) then
                 Loc1 := City[cix].Loc;
             for uix := 0 to nUn - 1 do
@@ -1933 +1946 @@
           for cix := 0 to RW[p1].nCity - 1 do
             if (RW[p1].City[cix].Loc >= 0) and
-              (RW[p1].City[cix].built[imTemple] > 0) then
+              (RW[p1].City[cix].Built[imTemple] > 0) then
               Inc(OracleIncome);
     end;
@@ -2396 +2409 @@
         dGround:
           LoseCityPop := (PModel.Cap[mcArtillery] > 0) or
-            (RW[MoveInfo.Defender].City[MoveInfo.Dcix].built[imWalls] = 0) and
+            (RW[MoveInfo.Defender].City[MoveInfo.Dcix].Built[imWalls] = 0) and
             (Continent[ToLoc] <> GrWallContinent[MoveInfo.Defender]);
         dSea:
-          LoseCityPop := RW[MoveInfo.Defender].City[MoveInfo.Dcix].built
+          LoseCityPop := RW[MoveInfo.Defender].City[MoveInfo.Dcix].Built
             [imCoastalFort] = 0;
         dAir:
-          LoseCityPop := RW[MoveInfo.Defender].City[MoveInfo.Dcix].built
+          LoseCityPop := RW[MoveInfo.Defender].City[MoveInfo.Dcix].Built
             [imMissileBat] = 0;
       end;
@@ -2459 +2472 @@
           for cix1 := 1 to nCity - 1 do
             if (City[cix1].Loc >= 0) and
-              ((ExpelToLoc < 0) or (City[cix1].built[imPalace] > 0)) then
+              ((ExpelToLoc < 0) or (City[cix1].Built[imPalace] > 0)) then
               ExpelToLoc := City[cix1].Loc;
         end;
@@ -3105 +3118 @@
         AllHumansDead := True;
         for p1 := 0 to nPl - 1 do
-          if (1 shl p1 and GAlive <> 0) and (bix[p1].Kind = btTerm) then
+          if (1 shl p1 and GAlive <> 0) and (bix[p1].Kind = btTerm) then begin
             AllHumansDead := False;
+            Break;
+          end;
         if (pDipActive >= 0) // still in negotiation mode
           or (pTurn = 0) and ((GWinner > 0) or (GTurn = MaxTurn) or
@@ -3225 +3240 @@
             (Integer(Data) >= 0) and (Integer(Data) < GTurn);
           for p1 := 1 to nPl - 1 do
-            if bix[p1].Kind = btTerm then
+            if bix[p1].Kind = btTerm then begin
               Ok := False;
+              Break;
+            end;
           // allow reload in AI-only games only
         end
@@ -3363 +3380 @@
               Result := eOfferNotAcceptable;
             for I := 0 to nDeliver + nCost - 1 do
-              if Price[I] = opChoose then
+              if Price[I] = opChoose then begin
                 Result := eOfferNotAcceptable;
+                Break;
+              end;
             for I := 0 to nCost - 1 do
               if not PayPrice(pDipActive, p1, Price[nDeliver + I], False) then
@@ -3487 +3506 @@
           begin // no tribute allowed!
             for I := 0 to TOffer(Data).nDeliver + TOffer(Data).nCost - 1 do
-              if (TOffer(Data).Price[I] and opMask = opTribute) then
+              if (TOffer(Data).Price[I] and opMask = opTribute) then begin
                 Result := eInvalidOffer;
+                Break;
+              end;
             for I := 0 to TOffer(Data).nDeliver + TOffer(Data).nCost - 1 do
-              if (TOffer(Data).Price[I] = opTreaty + trPeace) then
+              if (TOffer(Data).Price[I] = opTreaty + trPeace) then begin
                 Result := eOK;
+                Break;
+              end;
           end;
           for I := 0 to TOffer(Data).nDeliver - 1 do
@@ -3500 +3523 @@
             Result := eInvalidOffer;
           for I := 0 to nShipPart - 1 do
-            if CountPrice(TOffer(Data), opShipParts + I shl 16) > 1 then
+            if CountPrice(TOffer(Data), opShipParts + I shl 16) > 1 then begin
               Result := eInvalidOffer;
+              Break;
+            end;
           if CountPrice(TOffer(Data), opMoney) > 1 then
             Result := eInvalidOffer;
@@ -4191 +4216 @@
                 for I := 0 to nImpReplacement - 1 do
                   if (ImpReplacement[I].OldImp = NewProject and cpIndex) and
-                    (built[ImpReplacement[I].NewImp] > 0) then
-                    Result := eObsolete;
+                    (Built[ImpReplacement[I].NewImp] > 0) then begin
+                      Result := eObsolete;
+                      Break;
+                    end;
                 if Result = eObsolete then
                 else if Preq = preNA then
@@ -4199 +4226 @@
                 then
                   Result := eNoPreq
-                else if built[NewProject and cpIndex] > 0 then
+                else if Built[NewProject and cpIndex] > 0 then
                   Result := eInvalid
                 else if (NewProject and cpIndex < nWonder) and
@@ -4207 +4234 @@
                   (RW[Player].NatBuilt[imSpacePort] > 0) then
                   Result := eViolation // space port already exists
-                else if (NewProject = cpImp + imBank) and (built[imMarket] = 0)
+                else if (NewProject = cpImp + imBank) and (Built[imMarket] = 0)
                   or (NewProject = cpImp + imUniversity) and
-                  (built[imLibrary] = 0) or (NewProject = cpImp + imResLab) and
-                  (built[imUniversity] = 0) or (NewProject = cpImp + imMfgPlant)
-                  and (built[imFactory] = 0) then
+                  (Built[imLibrary] = 0) or (NewProject = cpImp + imResLab) and
+                  (Built[imUniversity] = 0) or (NewProject = cpImp + imMfgPlant)
+                  and (Built[imFactory] = 0) then
                   Result := eNoPreq;
                 case NewProject - cpImp of
@@ -4362 +4389 @@
         else
           with RW[Player].City[Subject] do
-            if built[Integer(Data)] = 0 then
+            if Built[Integer(Data)] = 0 then
               Result := eInvalid
             else if (RW[Player].Government = gAnarchy) or
@@ -4373 +4400 @@
               Inc(RW[Player].Money, Imp[Integer(Data)].Cost * BuildCostMod
                 [Difficulty[Player]] div 12);
-              built[Integer(Data)] := 0;
+              Built[Integer(Data)] := 0;
               if Imp[Integer(Data)].Kind in [ikNatLocal, ikNatGlobal] then
               begin
@@ -4402 +4429 @@
           else
             with RW[Player].City[Subject] do
-              if (built[OldImp] = 0) or (Project and cpImp = 0) or
+              if (Built[OldImp] = 0) or (Project and cpImp = 0) or
                 not(Imp[Project and cpIndex].Kind in [ikCommon, ikNatLocal,
                 ikNatGlobal]) then
@@ -4419 +4446 @@
                   Project0 := Project;
                 Prod0 := Prod;
-                built[OldImp] := 0;
+                Built[OldImp] := 0;
                 if Imp[OldImp].Kind in [ikNatLocal, ikNatGlobal] then
                 begin // nat. project lost

trunk/LocalPlayer/CityScreen.pas

@@ -883 +883 @@
             Sprite(Offscreen, HGrSystem, X - 4, Y + 29 - 3 * J, 10, 10,
               132, 115);
-        end
+        end;
       end;
     if imix[0] >= 0 then
@@ -1082 +1082 @@
         Loc1 := dLoc(cLoc, dx, dy);
         if (Loc1 >= 0) and (Loc1 < G.lx * G.ly) and
-          (MyMap[Loc1] and fTerrain < fGrass) then
-          IsPort := True;
+          (MyMap[Loc1] and fTerrain < fGrass) then begin
+            IsPort := True;
+            Break;
+          end;
       end;
 

trunk/LocalPlayer/ClientTools.pas

@@ -178 +178 @@
   Result := False;
   for p1 := 1 to nPl - 1 do
-    if G.RO[p1] <> nil then
+    if G.RO[p1] <> nil then begin
       Result := True;
+      Break;
+    end;
 end;
 
@@ -373 +375 @@
           if Abs(dx) + Abs(dy) = 2 then
             if Server(sMoveUnit - sExecute + dx and 7 shl 4 + dy and
-              7 shl 7, Me, uix, nil^) >= rExecuted then
-              Result := False;
+              7 shl 7, Me, uix, nil^) >= rExecuted then begin
+                Result := False;
+                Exit;
+              end;
 end;
 
@@ -608 +612 @@
                   dx := fix and 3 shl 1 - 3 + (dy + 3) and 1;
                   Loc1 := dLoc(MyCity[cix].Loc, dx, dy);
-                  if MarkCitiesAround(Loc1, cix) then
+                  if MarkCitiesAround(Loc1, cix) then begin
                     Done := False;
+                    Break;
+                  end;
                 end;
               Server(sSetCityTiles, Me, cix, Advice.Tiles);
@@ -664 +670 @@
         dx := fix and 3 shl 1 - 3 + (dy + 3) and 1;
         Loc1 := dLoc(MyCity[cix].Loc, dx, dy);
-        if MarkCitiesAround(Loc1, cix) then
+        if MarkCitiesAround(Loc1, cix) then begin
           Done := False;
+          Break;
+        end;
       end;
     if not Done then

trunk/LocalPlayer/Draft.pas

@@ -307 +307 @@
       for I := 0 to Lines - 1 do
       begin
-        if not(Code[I] in AutoFeature) then
+        if not (Code[I] in AutoFeature) then
         begin
           // paint +/- butttons
@@ -458 +458 @@
 procedure TDraftDlg.FormShow(Sender: TObject);
 var
-  count, D, I: Integer;
+  Count, D, I: Integer;
 begin
   Domain := dGround;
@@ -465 +465 @@
     Inc(Domain);
 
-  // count max number of features in any domain
+  // Count max number of features in any domain
   MaxLines := 0;
   for D := 0 to nDomains - 1 do
@@ -471 +471 @@
       (MyRO.Tech[upgrade[D, 0].Preq] >= tsApplicable) then
     begin
-      count := 0;
+      Count := 0;
       for I := 0 to nFeature - 1 do
         if IsFeatureInList(D, I) then
-          Inc(count);
-      if count > MaxLines then
-        MaxLines := count;
+          Inc(Count);
+      if Count > MaxLines then
+        MaxLines := Count;
     end;
   Cut := (MaxLines0 - MaxLines) * LinePitch;

trunk/LocalPlayer/Help.pas

@@ -965 +965 @@
       else if Item = 'AITSTAT' then
         for I := 0 to 3 do
-          AddLine(Phrases2.Lookup('AITSTAT', I), pkAITStat, I)
+          AddLine(Phrases2.Lookup('AITSTAT', I), pkAITStat, I);
     end;
   end;
@@ -1522 +1522 @@
           for Domain := 0 to nDomains - 1 do
             for I := 1 to nUpgrade - 1 do
-              if upgrade[Domain, I].Preq = No then
+              if Upgrade[Domain, I].Preq = No then
               begin
-                if upgrade[Domain, I].Strength > 0 then
+                if Upgrade[Domain, I].Strength > 0 then
                   AddLine(Format(HelpText.Lookup('STRENGTHUP'),
                     [Phrases.Lookup('DOMAIN', Domain), upgrade[Domain,
                     I].Strength]), pkDomain, Domain);
-                if upgrade[Domain, I].Trans > 0 then
+                if Upgrade[Domain, I].Trans > 0 then
                   AddLine(Format(HelpText.Lookup('TRANSUP'),
                     [Phrases.Lookup('DOMAIN', Domain), upgrade[Domain, I].Trans]
@@ -1534 +1534 @@
                 if No in FutureTech then
                   AddLine(Format(HelpText.Lookup('COSTUP'),
-                    [upgrade[Domain, I].Cost]), pkNormal_Dot)
+                    [Upgrade[Domain, I].Cost]), pkNormal_Dot)
                 else
                   AddLine(Format(HelpText.Lookup('COSTMIN'),
-                    [upgrade[Domain, I].Cost]), pkNormal_Dot)
+                    [Upgrade[Domain, I].Cost]), pkNormal_Dot)
               end;
           NextSection('EXPIRATION');

trunk/LocalPlayer/IsoEngine.pas

@@ -39 +39 @@
     function IsShoreTile(Loc: Integer): Boolean;
     procedure MakeDark(Line: PPixelPointer; Length: Integer);
+    procedure NameCity(X, Y, Loc: Integer);
+    procedure PaintBorder(X, Y, Loc, Tile: Integer);
+    function PoleTile(Loc: Integer): Integer;
     procedure SetTileSize(AValue: TTileSize);
     procedure ShadeOutside(x0, y0, Width, Height, xm, ym: Integer);
+    procedure ShowSpacePort(X, Y, Tile: Integer; CityInfo: TCityInfo);
   protected
     FOutput: TBitmap;
@@ -803 +807 @@
 end;
 
-function PoleTile(Loc: Integer): Integer;
+function TIsoMap.PoleTile(Loc: Integer): Integer;
 begin { virtual pole tile }
   Result := fUNKNOWN;
@@ -1047 +1051 @@
 end;
 
+procedure TIsoMap.NameCity(X, Y, Loc: Integer);
+var
+  cix, xs, W: Integer;
+  BehindCityInfo: TCityInfo;
+  S: string;
+  IsCapital: Boolean;
+begin
+  BehindCityInfo.Loc := Loc - 2 * G.lx;
+  if ShowCityNames and not (moEditMode in MapOptions) and
+    (BehindCityInfo.Loc >= 0) and (BehindCityInfo.Loc < G.lx * G.ly) and
+    (MyMap[BehindCityInfo.Loc] and fCity <> 0) then
+  begin
+    GetCityInfo(BehindCityInfo.Loc, cix, BehindCityInfo);
+    IsCapital := BehindCityInfo.Flags and ciCapital <> 0;
+    { if Showuix and (cix>=0) then s:=IntToStr(cix)
+      else } S := CityName(BehindCityInfo.ID);
+    W := FOutput.Canvas.TextWidth(S);
+    xs := X + xxt - (W + 1) div 2;
+    if IsCapital then
+      FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style + [TFontStyle.fsUnderline];
+    TextOut(xs + 1, Y - 9, $000000, S);
+    TextOut(xs, Y - 10, $FFFFFF, S);
+    if IsCapital then
+      FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style - [TFontStyle.fsUnderline];
+  end;
+end;
+
+procedure TIsoMap.PaintBorder(X, Y, Loc, Tile: Integer);
+var
+  dx, dy: Integer;
+  p1, p2, Loc1: Integer;
+begin
+  if ShowBorder and (Loc >= 0) and (Loc < G.lx * G.ly) and
+    (Tile and fTerrain <> fUNKNOWN) then begin
+    p1 := MyRO.Territory[Loc];
+    if (p1 >= 0) and (ShowMyBorder or (p1 <> Me)) then begin
+      if BordersOK^ and (1 shl p1) = 0 then begin
+        UnshareBitmap(Borders);
+        BitBltBitmap(Borders, 0, p1 * (yyt * 2), xxt * 2,
+          yyt * 2, HGrTerrain.Data,
+          1 + 8 * (xxt * 2 + 1), 1 + yyt + 16 * (yyt * 3 + 1));
+        BitmapReplaceColor(Borders, 0, p1 * (yyt * 2), xxt * 2, yyt * 2, $636363, Tribe[p1].Color);
+        BordersOK^ := BordersOK^ or 1 shl p1;
+      end;
+      for dy := 0 to 1 do
+        for dx := 0 to 1 do begin
+          Loc1 := dLoc(Loc, dx * 2 - 1, dy * 2 - 1);
+          begin
+            if (Loc1 < 0) or (Loc1 >= G.lx * G.ly) then
+              p2 := -1
+            else if MyMap[Loc1] and fTerrain = fUNKNOWN then
+              p2 := p1
+            else
+              p2 := MyRO.Territory[Loc1];
+            if p2 <> p1 then
+            begin
+              BitBltBitmapOutput(HGrTerrain.Mask, X + dx * xxt, Y + dy * yyt, xxt,
+                yyt, 1 + 8 * (xxt * 2 + 1) + dx * xxt,
+                1 + yyt + 16 * (yyt * 3 + 1) + dy * yyt, SRCAND);
+              BitBltBitmapOutput(Borders, X + dx * xxt, Y + dy * yyt, xxt, yyt, dx * xxt,
+                p1 * (yyt * 2) + dy * yyt, SRCPAINT);
+            end;
+          end;
+        end;
+    end;
+  end;
+end;
+
+procedure TIsoMap.ShowSpacePort(X, Y, Tile: Integer; CityInfo: TCityInfo);
+begin
+  if ShowObjects and not (moEditMode in MapOptions) and
+    (Tile and fCity <> 0) and (CityInfo.Flags and ciSpacePort <> 0) then
+    TerrainSprite(X + xxt, Y - 6, spSpacePort);
+end;
+
 // (x,y) is top left pixel of (2*xxt,3*yyt) rectangle
 procedure TIsoMap.PaintTileObjects(X, Y, Loc, CityLoc, CityOwner: Integer;
   UseBlink: Boolean);
 var
-  p1, p2, uix, cix, dy, Loc1, Tile, Multi, Destination: Integer;
+  uix, cix, dy, Tile, Multi, Destination: Integer;
   CityInfo: TCityInfo;
   UnitInfo: TUnitInfo;
@@ -1057 +1136 @@
   SpecialRow: Integer;
   SpecialCol: Integer;
-
-  procedure NameCity;
-  var
-    cix, xs, W: Integer;
-    BehindCityInfo: TCityInfo;
-    S: string;
-    IsCapital: Boolean;
-  begin
-    BehindCityInfo.Loc := Loc - 2 * G.lx;
-    if ShowCityNames and not (moEditMode in MapOptions) and
-      (BehindCityInfo.Loc >= 0) and (BehindCityInfo.Loc < G.lx * G.ly) and
-      (MyMap[BehindCityInfo.Loc] and fCity <> 0) then
-    begin
-      GetCityInfo(BehindCityInfo.Loc, cix, BehindCityInfo);
-      IsCapital := BehindCityInfo.Flags and ciCapital <> 0;
-      { if Showuix and (cix>=0) then s:=IntToStr(cix)
-        else } S := CityName(BehindCityInfo.ID);
-      W := FOutput.Canvas.TextWidth(S);
-      xs := X + xxt - (W + 1) div 2;
-      if IsCapital then
-        FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style + [TFontStyle.fsUnderline];
-      TextOut(xs + 1, Y - 9, $000000, S);
-      TextOut(xs, Y - 10, $FFFFFF, S);
-      if IsCapital then
-        FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style - [TFontStyle.fsUnderline];
-    end;
-  end;
-
-  procedure ShowSpacePort;
-  begin
-    if ShowObjects and not (moEditMode in MapOptions) and
-      (Tile and fCity <> 0) and (CityInfo.Flags and ciSpacePort <> 0) then
-      TerrainSprite(X + xxt, Y - 6, spSpacePort);
-  end;
-
-  procedure PaintBorder;
-  var
-    dx, dy: Integer;
-  begin
-    if ShowBorder and (Loc >= 0) and (Loc < G.lx * G.ly) and
-      (Tile and fTerrain <> fUNKNOWN) then begin
-      p1 := MyRO.Territory[Loc];
-      if (p1 >= 0) and (ShowMyBorder or (p1 <> Me)) then begin
-        if BordersOK^ and (1 shl p1) = 0 then begin
-          UnshareBitmap(Borders);
-          BitBltBitmap(Borders, 0, p1 * (yyt * 2), xxt * 2,
-            yyt * 2, HGrTerrain.Data,
-            1 + 8 * (xxt * 2 + 1), 1 + yyt + 16 * (yyt * 3 + 1));
-          BitmapReplaceColor(Borders, 0, p1 * (yyt * 2), xxt * 2, yyt * 2, $636363, Tribe[p1].Color);
-          BordersOK^ := BordersOK^ or 1 shl p1;
-        end;
-        for dy := 0 to 1 do
-          for dx := 0 to 1 do begin
-            Loc1 := dLoc(Loc, dx * 2 - 1, dy * 2 - 1);
-            begin
-              if (Loc1 < 0) or (Loc1 >= G.lx * G.ly) then
-                p2 := -1
-              else if MyMap[Loc1] and fTerrain = fUNKNOWN then
-                p2 := p1
-              else
-                p2 := MyRO.Territory[Loc1];
-              if p2 <> p1 then
-              begin
-                BitBltBitmapOutput(HGrTerrain.Mask, X + dx * xxt, Y + dy * yyt, xxt,
-                  yyt, 1 + 8 * (xxt * 2 + 1) + dx * xxt,
-                  1 + yyt + 16 * (yyt * 3 + 1) + dy * yyt, SRCAND);
-                BitBltBitmapOutput(Borders, X + dx * xxt, Y + dy * yyt, xxt, yyt, dx * xxt,
-                  p1 * (yyt * 2) + dy * yyt, SRCPAINT);
-              end;
-            end;
-          end;
-      end;
-    end;
-  end;
-
 begin
   if (Loc < 0) or (Loc >= G.lx * G.ly) then
@@ -1143 +1147 @@
     (X > FRight) then
   begin
-    NameCity;
-    ShowSpacePort;
+    NameCity(X, Y, Loc);
+    ShowSpacePort(X, Y, Tile, CityInfo);
     Exit;
   end;
   if Tile and fTerrain = fUNKNOWN then
   begin
-    NameCity;
-    ShowSpacePort;
+    NameCity(X, Y, Loc);
+    ShowSpacePort(X, Y, Tile, CityInfo);
     Exit;
   end; { square not discovered }
 
   if not (FoW and (Tile and fObserved = 0)) then
-    PaintBorder;
+    PaintBorder(X, Y, Loc, Tile);
 
   if (Loc >= 0) and (Loc < G.lx * G.ly) and (Loc = FAdviceLoc) then
@@ -1211 +1215 @@
 
   if FoW and (Tile and fObserved = 0) then
-    PaintBorder;
+    PaintBorder(X, Y, Loc, Tile);
 
 {$IFNDEF SCR}
@@ -1239 +1243 @@
       else TerrainSprite(X, Y, 8 + 9 * 1); }
 
-    NameCity;
-    ShowSpacePort;
+    NameCity(X, Y, Loc);
+    ShowSpacePort(X, Y, Tile, CityInfo);
     if Tile and fCity <> 0 then
       PaintCity(X + xxt, Y + yyt, CityInfo, CityOwner < 0);
@@ -1383 +1387 @@
 begin
   Result := False;
-  for Dir := 0 to 7 do
-  begin
+  for Dir := 0 to 7 do begin
     ConnLoc := dLoc(Loc, Dirx[Dir], Diry[Dir]);
     if (ConnLoc < 0) or (ConnLoc >= G.lx * G.ly) or
-      ((MyMap[ConnLoc] - 2) and fTerrain < 13) then
-      Result := True;
+      ((MyMap[ConnLoc] - 2) and fTerrain < 13) then begin
+        Result := True;
+        Break;
+      end;
   end;
 end;

trunk/LocalPlayer/NatStat.pas

@@ -229 +229 @@
   HasContact := False;
   for p1 := 0 to nPl - 1 do
-    if (p1 <> Me) and (CurrentReport.Treaty[p1] > trNoContact) then
+    if (p1 <> Me) and (CurrentReport.Treaty[p1] > trNoContact) then begin
       HasContact := True;
+      Break;
+    end;
   if HasContact then
   begin

trunk/LocalPlayer/Nego.pas

@@ -366 +366 @@
       begin
         MyAllowed := MyAllowed + [opAllTech shr 24];
-        Break
+        Break;
       end;
     OppoAllowed := OppoAllowed + [opCivilReport shr 24, opAllTech shr 24];

trunk/LocalPlayer/Select.pas

@@ -1119 +1119 @@
                   if (Loc1 >= 0) and (Loc1 < G.lx * G.ly) and
                     ((MyMap[Loc1] and fTerrain = fShore) or
-                    (MyMap[Loc1] and fCanal > 0)) then
-                    Ok := True;
+                    (MyMap[Loc1] and fCanal > 0)) then begin
+                      Ok := True;
+                      Break;
+                    end;
                 end;
           end
@@ -1166 +1168 @@
         for I := 0 to nDomains - 1 do
           if (upgrade[I, 0].Preq = preNone) or
-            (MyRO.Tech[upgrade[I, 0].Preq] >= tsApplicable) then
-            Ok := True;
+            (MyRO.Tech[upgrade[I, 0].Preq] >= tsApplicable) then begin
+              Ok := True;
+              Break;
+            end;
         if Ok then { new unit class }
         begin
@@ -1273 +1277 @@
           with MyRO.EnemyReport[Column[J]]^ do
             if (MyRO.Alive and (1 shl Column[J]) <> 0) and
-              (TurnOfCivilReport >= 0) and (ResearchTech = adMilitary) then
-              Ok := True;
+              (TurnOfCivilReport >= 0) and (ResearchTech = adMilitary) then begin
+                Ok := True;
+                Break;
+              end;
         if Ok then
         begin
@@ -1333 +1339 @@
           for emix := 0 to MyRO.nEnemyModel - 1 do
             if (MyRO.EnemyModel[emix].Owner = DipMem[Me].pContact) and
-              IsSameModel(MyRO.EnemyModel[emix], mi) then
-              Ok := False;
+              IsSameModel(MyRO.EnemyModel[emix], mi) then begin
+                Ok := False;
+                Break;
+              end;
           if Ok then
           begin
@@ -1439 +1447 @@
           end;
         SortModels;
-        FirstShrinkedLine[0] := 0
+        FirstShrinkedLine[0] := 0;
       end;
     kTribe:
@@ -1554 +1562 @@
   MultiPage := False;
   for I := 1 to MaxLayer - 1 do
-    if Lines[I] > 0 then
+    if Lines[I] > 0 then begin
       MultiPage := True;
+      Break;
+    end;
   WideBottom := MultiPage or (Kind = kScience) or
     not Phrases2FallenBackToEnglish and
@@ -1737 +1747 @@
           ((AdvValue[I] < 2000) or (MyRO.Tech[adMassProduction] > tsNA)) and
           ((AdvValue[I] < 1000) or (MyRO.Tech[adScience] > tsNA)) and
-          (Server(sSetResearch - sExecute, Me, I, nil^) < rExecuted) then
-          ShowFocus := True;
+          (Server(sSetResearch - sExecute, Me, I, nil^) < rExecuted) then begin
+            ShowFocus := True;
+            Break;
+          end;
     end;
   ToggleBtn.Visible := (Kind = kCities) and not Supervising or (Kind = kAdvance)

trunk/LocalPlayer/Term.pas

@@ -1228 +1228 @@
       IsTreatyDeal := False;
       for I := 0 to ReceivedOffer.nDeliver + ReceivedOffer.nCost - 1 do
-        if ReceivedOffer.Price[I] and opMask = opTreaty then
+        if ReceivedOffer.Price[I] and opMask = opTreaty then begin
           IsTreatyDeal := True;
+          Break;
+        end;
       if IsTreatyDeal then
         Play('NEWTREATY')
@@ -1466 +1468 @@
 var
   I, cix, mix: Integer;
-  need: Boolean;
+  Need: Boolean;
   mi: TModelInfo;
 begin
@@ -1475 +1477 @@
   end;
   if (sbWonder in Check) and not (sbWonder in SoundPreloadDone) then begin
-    need := False;
+    Need := False;
     for I := 0 to nWonder - 1 do
-      if MyRO.Wonder[I].CityID <> WonderNotBuiltYet then
-        need := True;
-    if need then begin
+      if MyRO.Wonder[I].CityID <> WonderNotBuiltYet then begin
+        Need := True;
+        Break;
+      end;
+    if Need then begin
       for I := 0 to nWonderBlock - 1 do
         PreparePlay(WonderBlock[I]);
@@ -1630 +1634 @@
           for I := 0 to nShipPart - 1 do
           begin
-            if Ship1Change[I] > 0 then
-              Ship1Plus := True;
-            if Ship2Change[I] > 0 then
-              Ship2Plus := True;
+            if Ship1Change[I] > 0 then Ship1Plus := True;
+            if Ship2Change[I] > 0 then Ship2Plus := True;
           end;
           if Ship1Plus and Ship2Plus then
@@ -2140 +2142 @@
       for cix := 0 to MyRO.nCity - 1 do
         if (MyCity[cix].Loc >= 0) and (MyCity[cix].ID = MyRO.Wonder[I].CityID)
-        then
+        then begin
           OwnWonder := True;
+          Break;
+        end;
       if MyRO.Wonder[I].CityID <> MyData.ToldWonders[I].CityID then
       begin
@@ -3029 +3033 @@
           IsTreatyDeal := False;
           for I := 0 to ReceivedOffer.nDeliver + ReceivedOffer.nCost - 1 do
-            if DipMem[Me].SentOffer.Price[I] and opMask = opTreaty then
+            if DipMem[Me].SentOffer.Price[I] and opMask = opTreaty then begin
               IsTreatyDeal := True;
+              Break;
+            end;
           if IsTreatyDeal then
             Play('NEWTREATY')
@@ -3995 +4001 @@
     for I := 2 to nGov - 1 do
       if (GovPreq[I] <> preNA) and
-        ((GovPreq[I] = preNone) or (MyRO.Tech[GovPreq[I]] >= tsApplicable)) then
-        AltGovs := True;
+        ((GovPreq[I] = preNone) or (MyRO.Tech[GovPreq[I]] >= tsApplicable)) then begin
+          AltGovs := True;
+          Break;
+        end;
 
     if not AltGovs then
@@ -4296 +4304 @@
             begin
               Result := True;
-              Exit
+              Exit;
             end;
           end
@@ -4490 +4498 @@
     Skipped := WasSkipped;
     for p1 := 1 to nPl - 1 do
-      if G.RO[p1] <> nil then
+      if G.RO[p1] <> nil then begin
         Skipped := True; // don't show enemy moves in hotseat mode
+        Break;
+      end;
   end
   else
@@ -7465 +7475 @@
       Multi := False;
       for p1 := 1 to nPl - 1 do
-        if G.RO[p1] <> nil then
+        if G.RO[p1] <> nil then begin
           Multi := True;
+          Break;
+        end;
       mEnemyMovement.Visible := not Multi;
     end;
@@ -7560 +7572 @@
     for p1 := 0 to nPl - 1 do
       if MyRO.Ship[p1].Parts[spComp] + MyRO.Ship[p1].Parts[spPow] +
-        MyRO.Ship[p1].Parts[spHab] > 0 then
-        mShips.Enabled := True;
+        MyRO.Ship[p1].Parts[spHab] > 0 then begin
+          mShips.Enabled := True;
+          Break;
+        end;
   end
   else if Popup = UnitPopup then
@@ -7685 +7699 @@
       if NeedSep then
         LastSep := Popup.Items[I];
-      NeedSep := False
+      NeedSep := False;
     end
     else if Popup.Items[I].Visible then
       NeedSep := True;
   if (LastSep <> nil) and not NeedSep then
-    LastSep.Visible := False
+    LastSep.Visible := False;
 end;
 

trunk/NoTerm.pas

@@ -256 +256 @@
                 ShipComplete := True;
                 for I := 0 to nShipPart - 1 do
-                  if G.RO[Me].Ship[P].Parts[I] < ShipNeed[I] then
+                  if G.RO[Me].Ship[P].Parts[I] < ShipNeed[I] then begin
                     ShipComplete := False;
+                    Break;
+                  end;
                 if ShipComplete then
                   Inc(WinStat[P]);