Changeset 549 for trunk/LocalPlayer/Term.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/Term.pas (modified) (12 diffs)

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;