Changeset 549 for trunk/LocalPlayer/Select.pas

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.

File:

• trunk/LocalPlayer/Select.pas (modified) (7 diffs)

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)