Changeset 558 for trunk/GameServer.pas

Timestamp:

Apr 25, 2024, 6:31:34 PM (3 weeks ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/GameServer.pas (modified) (9 diffs)

trunk/GameServer.pas

@@ -602 +602 @@
           ($7F01FFFF or fPrefStartPos or fStartPos) or ($F shl 27);
         if RealMap[Loc1] and (fTerrain or fSpecial) = fSwamp or fSpecial2 then
-          RealMap[Loc1] := RealMap[Loc1] and not(fTerrain or fSpecial) or
+          RealMap[Loc1] := RealMap[Loc1] and not (fTerrain or fSpecial) or
             (fSwamp or fSpecial1);
         if (RealMap[Loc1] and fDeadLands <> 0) and
           (RealMap[Loc1] and fTerrain <> fArctic) then
-          RealMap[Loc1] := RealMap[Loc1] and not(fTerrain or fSpecial)
+          RealMap[Loc1] := RealMap[Loc1] and not (fTerrain or fSpecial)
             or fDesert;
       end;
@@ -1647 +1647 @@
             V21_to_Loc(Loc, Radius);
             for V21 := 1 to 26 do
-              if Tiles and (1 shl V21) and not(1 shl CityOwnTile) <> 0 then
+              if Tiles and (1 shl V21) and not (1 shl CityOwnTile) <> 0 then
               begin
                 Loc1 := Radius[V21];
@@ -1658 +1658 @@
                   (Treaty[Occupant[Loc1]] < trPeace) then
                 begin
-                  Tiles := Tiles and not(1 shl V21);
+                  Tiles := Tiles and not (1 shl V21);
                   UsedByCity[Loc1] := -1;
                   Flags := Flags or chSiege;
@@ -1793 +1793 @@
       begin // nation made extinct
         Happened := Happened or phExtinct;
-        GAlive := GAlive and not(1 shl pTurn);
+        GAlive := GAlive and not (1 shl pTurn);
         Stat[stPop, pTurn, GTurn] := 0;
         Stat[stMil, pTurn, GTurn] := 0;
@@ -1873 +1873 @@
           end;
       end;
-      if WinOnAlone and (GAlive and not(1 shl pTurn or 1) = 0) then
+      if WinOnAlone and (GAlive and not (1 shl pTurn or 1) = 0) then
         GWinner := 1 shl pTurn; // break if only one nation left
 
@@ -2175 +2175 @@
           GiveCivilReport(P, MoveInfo.Defender);
           for I := 0 to nAdv - 1 do
-            if not(I in FutureTech) and (RW[P].Tech[I] < tsSeen) and
+            if not (I in FutureTech) and (RW[P].Tech[I] < tsSeen) and
               (RW[MoveInfo.Defender].Tech[I] >= tsApplicable) then
             begin
@@ -2185 +2185 @@
         if Mode = moPlaying then
           LogCheckBorders(P, nCity - 1, MoveInfo.Defender);
-{$IFOPT O-} if Mode < moPlaying then
-          InvalidTreatyMap := not(1 shl P); {$ENDIF}
+{$IFOPT O-}
+        if Mode < moPlaying then
+          InvalidTreatyMap := not (1 shl P);
+{$ENDIF}
         // territory should not be considered for the rest of the command
         // execution, because during loading a game it's incorrect before
@@ -4113 +4115 @@
         if (Subject >= RW[Player].nUn) or (RW[Player].Un[Subject].Loc < 0) then
           Result := eInvalid
-        else if not(RW[Player].Model[RW[Player].Un[Subject].mix].Kind
+        else if not (RW[Player].Model[RW[Player].Un[Subject].mix].Kind
           in [mkSettler, mkSlaves]) and
           (RW[Player].Un[Subject].Flags and unConscripts = 0) then
@@ -4425 +4427 @@
         begin
           if (OldImp < 0) or (OldImp >= nImp) or
-            not(Imp[OldImp].Kind in [ikCommon, ikNatLocal, ikNatGlobal]) then
+            not (Imp[OldImp].Kind in [ikCommon, ikNatLocal, ikNatGlobal]) then
             Result := eInvalid
           else
             with RW[Player].City[Subject] do
               if (Built[OldImp] = 0) or (Project and cpImp = 0) or
-                not(Imp[Project and cpIndex].Kind in [ikCommon, ikNatLocal,
+                not (Imp[Project and cpIndex].Kind in [ikCommon, ikNatLocal,
                 ikNatGlobal]) then
                 Result := eInvalid