Changeset 549 for trunk/GameServer.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/GameServer.pas (modified) (25 diffs)

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