Changeset 550 for trunk/LocalPlayer

Timestamp:

Apr 22, 2024, 10:17:01 PM (4 weeks ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk/LocalPlayer

Files:

• CityScreen.pas (modified) (2 diffs)
• Diagram.pas (modified) (1 diff)
• Draft.pas (modified) (1 diff)
• Help.pas (modified) (1 diff)
• IsoEngine.pas (modified) (2 diffs)
• Select.pas (modified) (3 diffs)
• Term.pas (modified) (6 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -1188 +1188 @@
     begin
       I := 5;
-      while (I >= 0) and not((X >= xZoomMap + 14 + 72 * (I mod 3)) and
+      while (I >= 0) and not ((X >= xZoomMap + 14 + 72 * (I mod 3)) and
         (X < xZoomMap + 14 + 56 + 72 * (I mod 3)) and
         (Y >= yZoomMap + 14 + 56 * (I div 3)) and
@@ -1299 +1299 @@
     begin
       I := 5;
-      while (I >= 0) and not((X >= xZoomMap + 64 * (I mod 3)) and
+      while (I >= 0) and not ((X >= xZoomMap + 64 * (I mod 3)) and
         (X < xZoomMap + 64 + 64 * (I mod 3)) and
         (Y >= yZoomMap + 20 + 48 * (I div 3)) and

trunk/LocalPlayer/Diagram.pas

@@ -111 +111 @@
       Sprite(Canvas, HGrSystem2, Left + Width div 2 + xComp[3] + 32,
         Top + 100 + 46 + yComp[3], 16, 27, 18, 82);
-    if (nComp <> 6) and (nComp <> 2) and not((nComp = 0) and (nPow < 1)) then
+    if (nComp <> 6) and (nComp <> 2) and not ((nComp = 0) and (nPow < 1)) then
       Sprite(Canvas, HGrSystem2, Left + Width div 2 + xComp[nComp],
         Top + 100 + 7 + yComp[nComp], 16, 27, 18, 82);
-    if (nComp <> 6) and (nComp <> 3) and not((nComp = 0) and (nPow < 2)) then
+    if (nComp <> 6) and (nComp <> 3) and not ((nComp = 0) and (nPow < 2)) then
       Sprite(Canvas, HGrSystem2, Left + Width div 2 + xComp[nComp],
         Top + 100 + 46 + yComp[nComp], 16, 27, 18, 82);

trunk/LocalPlayer/Draft.pas

@@ -379 +379 @@
       ((Feature[I].Preq = preSun) and (MyRO.Wonder[woSun].EffectiveOwner = Me)
       or (Feature[I].Preq >= 0) and (MyRO.Tech[Feature[I].Preq] >= tsApplicable)
-      ) and not((Feature[I].Preq = adSteamEngine) and
+      ) and not ((Feature[I].Preq = adSteamEngine) and
       (MyRO.Tech[adNuclearPower] >= tsApplicable)) then
     begin

trunk/LocalPlayer/Help.pas

@@ -567 +567 @@
           else if HelpLineInfo.CrossLink then
             Sprite(OffScreen, HGrSystem, 12, I * 24 + 5, 14, 14, 80, 1)
-          else if not((Kind = hkMisc) and (No = Integer(miscMain))) then
+          else if not ((Kind = hkMisc) and (No = Integer(miscMain))) then
             Sprite(OffScreen, HGrSystem, 10, I * 24 + 6, 14, 14, 65, 1);
           x0[I] := 24;

trunk/LocalPlayer/IsoEngine.pas

@@ -988 +988 @@
   begin
     Conn := Connection4(Loc, fRiver, fRiver) or
-      Connection4(Loc, fTerrain, fShore) or Connection4(Loc, fTerrain,
-      fUNKNOWN);
+      Connection4(Loc, fTerrain, fShore) or Connection4(Loc, fTerrain, fUNKNOWN);
     TerrainSprite(X, Y, spRiver + Conn mod 8 + (Conn div 8) * TerrainIconCols);
   end;
@@ -1260 +1259 @@
         UnitInfo.Health := DefHealth;
       if (UnitInfo.Owner <> CityOwner) and
-        not((CityOwner = Me) and (MyRO.Treaty[UnitInfo.Owner] = trAlliance))
+        not ((CityOwner = Me) and (MyRO.Treaty[UnitInfo.Owner] = trAlliance))
       then
 {$IFNDEF SCR} if (UnFocus >= 0) and (Loc = MyUn[UnFocus].Loc) then { active unit }

trunk/LocalPlayer/Select.pas

@@ -181 +181 @@
     LoweredTextOut(Canvas, -1, MainTexture,
       (Width - BiColorTextWidth(Canvas, S)) div 2, 31, S);
-  if not MultiPage and (Kind in [kProject, kAdvance, kFarAdvance]) and not Phrases2FallenBackToEnglish
-  then
-  begin
+  if not MultiPage and (Kind in [kProject, kAdvance, kFarAdvance]) and
+    not Phrases2FallenBackToEnglish then begin
     S := Phrases2.Lookup('SHIFTCLICK');
     LoweredTextOut(Canvas, -2, MainTexture,
@@ -1396 +1395 @@
           Code[1, Lines[0]] := MyRO.nEnemyModel - 1;
           while (Code[1, Lines[0]] >= 0) and
-            not((MyRO.EnemyModel[Code[1, Lines[0]]].Owner = pView) and
+            not ((MyRO.EnemyModel[Code[1, Lines[0]]].Owner = pView) and
             (MyRO.EnemyModel[Code[1, Lines[0]]].mix = I)) do
             Dec(Code[1, Lines[0]]);
@@ -1678 +1677 @@
 begin
   ForceClose := (ListKind <> Kind) and
-    not((Kind = kCities) and (ListKind = kCityEvents)) and
-    not((Kind = kCityEvents) and (ListKind = kCities)) and
-    not((Kind = kModels) and (ListKind = kEModels)) and
-    not((Kind = kEModels) and (ListKind = kModels));
+    not ((Kind = kCities) and (ListKind = kCityEvents)) and
+    not ((Kind = kCityEvents) and (ListKind = kCities)) and
+    not ((Kind = kModels) and (ListKind = kEModels)) and
+    not ((Kind = kEModels) and (ListKind = kModels));
 
   Kind := ListKind;

trunk/LocalPlayer/Term.pas

@@ -1279 +1279 @@
   Loc0: Integer;
 begin
-  Assert(not((uix >= 0) and Supervising));
+  Assert(not ((uix >= 0) and Supervising));
   if uix <> UnFocus then
   begin
@@ -3082 +3082 @@
     cShowUnitChanged, cShowCityChanged, cShowAfterMove, cShowAfterAttack:
       if (Idle and (NewPlayer = Me) or not Idle and not skipped) and
-        not((GameMode = cMovie) and (MovieSpeed = 4)) then
+        not ((GameMode = cMovie) and (MovieSpeed = 4)) then
       begin
         Assert(NewPlayer = Me);
@@ -3146 +3146 @@
       if (Idle and (NewPlayer = Me) or not Idle and not skipped and
         (TShowMove(Data).emix <> $FFFF)) and
-        not((GameMode = cMovie) and (MovieSpeed = 4)) then
+        not ((GameMode = cMovie) and (MovieSpeed = 4)) then
       begin
         Assert(NewPlayer = Me);
@@ -3327 +3327 @@
       if (Idle and (NewPlayer = Me) or not Idle and not skipped and
         (TShowMove(Data).emix <> $FFFF)) and
-        not((GameMode = cMovie) and (MovieSpeed = 4)) then
+        not ((GameMode = cMovie) and (MovieSpeed = 4)) then
       begin
         Assert(NewPlayer = Me);
@@ -6023 +6023 @@
   begin // attack -- search enemy unit
     if (MyModel[MyUn[UnFocus].mix].Attack = 0) and
-      not((MyModel[MyUn[UnFocus].mix].Cap[mcBombs] > 0) and
+      not ((MyModel[MyUn[UnFocus].mix].Cap[mcBombs] > 0) and
       (MyUn[UnFocus].Flags and unBombsLoaded <> 0)) then
     begin
@@ -7619 +7619 @@
       ((MyRO.Wonder[woGardens].EffectiveOwner = Me) or
       (Tile and fTerrain <> fArctic) and (Tile and fTerrain <> fDesert)) and
-      not((mox.Domain = dAir) and (Tile and fCity = 0) and
+      not ((mox.Domain = dAir) and (Tile and fCity = 0) and
       (Tile and fTerImp <> tiBase));
-    mStay.Visible := not((mox.Domain = dAir) and (Tile and fCity = 0) and
+    mStay.Visible := not ((mox.Domain = dAir) and (Tile and fCity = 0) and
       (Tile and fTerImp <> tiBase));
     mCity.Visible := Extended and (mox.Kind = mkSettler) or