Changeset 558 for trunk/LocalPlayer

Timestamp:

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

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk/LocalPlayer

Files:

• CityType.pas (modified) (1 diff)
• Draft.pas (modified) (3 diffs)
• Enhance.pas (modified) (1 diff)
• Nego.pas (modified) (4 diffs)
• Select.pas (modified) (8 diffs)
• Term.pas (modified) (15 diffs)

trunk/LocalPlayer/CityType.pas

@@ -158 +158 @@
   nPool := 0;
   for iix := nWonder to nImp - 1 do
-    if not(iix in Listed) and (Imp[iix].Kind = ikCommon) and (iix <> imTrGoods)
+    if not (iix in Listed) and (Imp[iix].Kind = ikCommon) and (iix <> imTrGoods)
       and (Imp[iix].Preq <> preNA) and
       ((Imp[iix].Preq = preNone) or (MyRO.Tech[Imp[iix].Preq] >= tsApplicable))

trunk/LocalPlayer/Draft.pas

@@ -419 +419 @@
     else
       Result := 30000 + AdvValue[FeaturePreq];
-    if not(fix in AutoFeature) then
+    if not (fix in AutoFeature) then
       Inc(Result, 90000);
   end;
@@ -449 +449 @@
 function TDraftDlg.IsFeatureInList(D, I: Integer): Boolean;
 begin
-  Result := not(I in AutoFeature) and (1 shl D and Feature[I].Domains <> 0) and
+  Result := not (I in AutoFeature) and (1 shl D and Feature[I].Domains <> 0) and
     (Feature[I].Preq <> preNA) and
     ((Feature[I].Preq = preNone) or (Feature[I].Preq = preSun) and
@@ -531 +531 @@
       if (X >= xFeature - 21) and (X < ClientWidth) and (ssShift in Shift) then
         MainScreen.HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkFeature, Code[I])
-      else if not(Code[I] in AutoFeature) then
+      else if not (Code[I] in AutoFeature) then
       begin
         if (Code[I] < mcFirstNonCap) and (X >= xFeature - 21) and

trunk/LocalPlayer/Enhance.pas

@@ -360 +360 @@
     if NewJob in [jIrr, jFarm, jTrans] then
       RemoveJob(jMine);
-    if (NewJob = jRR) and not(jRoad in Done) then
+    if (NewJob = jRR) and not (jRoad in Done) then
     begin
       MyData.EnhancementJobs[Page, Stage] := jRoad;
       Inc(Stage);
     end;
-    if (NewJob = jFarm) and not(jIrr in Done) then
+    if (NewJob = jFarm) and not (jIrr in Done) then
     begin
       MyData.EnhancementJobs[Page, Stage] := jIrr;

trunk/LocalPlayer/Nego.pas

@@ -373 +373 @@
   begin // check techs
     for I := 0 to nAdv - 1 do
-      if not(I in FutureTech) then
+      if not (I in FutureTech) then
         if (MyRO.Tech[I] < tsSeen) and
           (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] >= tsApplicable) then
@@ -732 +732 @@
     end;
     Price := ButtonPrice[TButtonN(Sender).Tag and $FF];
-    if not(Price shr 24 in OppoAllowed) then
+    if not (Price shr 24 in OppoAllowed) then
       Exit;
     case Price of
@@ -845 +845 @@
     end;
     Price := ButtonPrice[TButtonN(Sender).Tag and $FF];
-    if not(Price shr 24 in MyAllowed) then
+    if not (Price shr 24 in MyAllowed) then
       Exit;
     case Price of
@@ -936 +936 @@
     Exit;
   NewCommand := TButtonN(Sender).Tag and $FF + scDipStart;
-  if not(NewCommand - scDipStart in CommandAllowed) then
+  if not (NewCommand - scDipStart in CommandAllowed) then
     Exit;
   if (NewCommand = scDipCancelTreaty) and

trunk/LocalPlayer/Select.pas

@@ -139 +139 @@
 procedure TListDlg.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
 begin
-  CanClose := Closable or not(Kind in MustChooseKind);
+  CanClose := Closable or not (Kind in MustChooseKind);
 end;
 
@@ -918 +918 @@
   then
     Include(Shift, ssShift); // don't close list window
-  if (ssLeft in Shift) and not(ssShift in Shift) then
+  if (ssLeft in Shift) and not (ssShift in Shift) then
   begin
     if Selected <> -2 then
@@ -1089 +1089 @@
             TryAddImpLine(0, I + cpImp);
         for I := nWonder to nImp - 1 do
-          if not(Imp[I].Kind in [ikCommon, ikTrGoods]) and
+          if not (Imp[I].Kind in [ikCommon, ikTrGoods]) and
             ((MyRO.NatBuilt[I] = 0) or (Imp[I].Kind = ikNatLocal)) then
             TryAddImpLine(0, I + cpImp);
@@ -1182 +1182 @@
         Inc(Lines[0]);
         for I := 0 to nAdv - 1 do
-          if not(I in FutureTech) and (MyRO.Tech[I] < tsApplicable) and
+          if not (I in FutureTech) and (MyRO.Tech[I] < tsApplicable) and
             ((AdvValue[I] < 2000) or (MyRO.Tech[adMassProduction] > tsNA)) and
             ((AdvValue[I] < 1000) or (MyRO.Tech[adScience] > tsNA)) then
@@ -1194 +1194 @@
       begin
         for I := 0 to nAdv - 1 do
-          if not(I in FutureTech) and (MyRO.Tech[I] >= tsApplicable) and
+          if not (I in FutureTech) and (MyRO.Tech[I] >= tsApplicable) and
             (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] < tsSeen) then
           begin
@@ -1210 +1210 @@
       begin
         for I := 0 to nAdv - 1 do
-          if not(I in FutureTech) and (MyRO.Tech[I] < tsSeen) and
+          if not (I in FutureTech) and (MyRO.Tech[I] < tsSeen) and
             (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] >= tsApplicable) then
           begin
@@ -1743 +1743 @@
       ShowFocus := False;
       for I := 0 to nAdv - 1 do
-        if not(I in FutureTech) and (MyRO.Tech[I] < tsApplicable) and
+        if not (I in FutureTech) and (MyRO.Tech[I] < tsApplicable) and
           ((AdvValue[I] < 2000) or (MyRO.Tech[adMassProduction] > tsNA)) and
           ((AdvValue[I] < 1000) or (MyRO.Tech[adScience] > tsNA)) and
@@ -1753 +1753 @@
   ToggleBtn.Visible := (Kind = kCities) and not Supervising or (Kind = kAdvance)
     and ShowFocus or (Kind = kModels) or (Kind = kEModels);
-  CloseBtn.Visible := not(Kind in MustChooseKind);
+  CloseBtn.Visible := not (Kind in MustChooseKind);
 
   inherited ShowNewContent(NewMode, ForceClose);

trunk/LocalPlayer/Term.pas

@@ -1991 +1991 @@
               for I := 0 to nShipPart - 1 do
                 if MyRO.Ship[p1].Parts[I] < ShipNeed[I] then
-                  Winners := Winners and not(1 shl p1);
+                  Winners := Winners and not (1 shl p1);
             end;
           Assert(Winners <> 0);
@@ -3104 +3104 @@
           else if CurrentMoveInfo.IsAlly then
             CurrentMoveInfo.DoShow :=
-              not(mAlNoMoves.Checked or mAlEffectiveMovesOnly.Checked)
+              not (mAlNoMoves.Checked or mAlEffectiveMovesOnly.Checked)
           else
             CurrentMoveInfo.DoShow :=
-              not(mEnNoMoves.Checked or mEnAttacks.Checked);
+              not (mEnNoMoves.Checked or mEnAttacks.Checked);
         end;
         // else keep DoShow from cShowMove/cShowAttack
@@ -3211 +3211 @@
             else if CurrentMoveInfo.IsAlly then
               CurrentMoveInfo.DoShow := not mAlNoMoves.Checked and
-                not(mAlEffectiveMovesOnly.Checked and
+                not (mAlEffectiveMovesOnly.Checked and
                 (Command <> cShowCapturing))
             else
               CurrentMoveInfo.DoShow := not mEnNoMoves.Checked and
-                not(mEnAttacks.Checked and (Command <> cShowCapturing));
+                not (mEnAttacks.Checked and (Command <> cShowCapturing));
             if CurrentMoveInfo.DoShow then
             begin
@@ -3804 +3804 @@
     else
       Destination := Status shr 16;
-    Status := Status and not(usStay or usRecover) or usWaiting;
+    Status := Status and not (usStay or usRecover) or usWaiting;
     MoveToLoc(Destination, True);
   end;
@@ -3837 +3837 @@
     else
     begin
-      Status := Status and not(usStay or usRecover or usEnhance);
+      Status := Status and not (usStay or usRecover or usEnhance);
       MoveToLoc(maNextCity, True);
     end;
@@ -5729 +5729 @@
   if (MouseLoc < 0) or (MouseLoc >= G.lx * G.ly) then
     Exit;
-  if (Button = TMouseButton.mbLeft) and not(ssShift in Shift) then
+  if (Button = TMouseButton.mbLeft) and not (ssShift in Shift) then
   begin
     DoCenter := True;
@@ -5753 +5753 @@
         if MyMap[MouseLoc] and (fDeadLands or fModern) = BrushType and
           (fDeadLands or fModern) then
-          EditTileData.NewTile := MyMap[MouseLoc] and not(fDeadLands or fModern)
+          EditTileData.NewTile := MyMap[MouseLoc] and not (fDeadLands or fModern)
         else
-          EditTileData.NewTile := MyMap[MouseLoc] and not(fDeadLands or fModern)
+          EditTileData.NewTile := MyMap[MouseLoc] and not (fDeadLands or fModern)
             or BrushType
       else if BrushType and fTerImp <> 0 then
@@ -5766 +5766 @@
           (fPrefStartPos or fStartPos) then
           EditTileData.NewTile := MyMap[MouseLoc] and
-            not(fPrefStartPos or fStartPos)
+            not (fPrefStartPos or fStartPos)
         else
           EditTileData.NewTile := MyMap[MouseLoc] and
-            not(fPrefStartPos or fStartPos) or BrushType
+            not (fPrefStartPos or fStartPos) or BrushType
       else
         EditTileData.NewTile := MyMap[MouseLoc] xor BrushType;
@@ -5839 +5839 @@
         PanelPaint;
       end // own unit
-      else if (MyMap[MouseLoc] and fSpiedOut <> 0) and not(ssCtrl in Shift) then
+      else if (MyMap[MouseLoc] and fSpiedOut <> 0) and not (ssCtrl in Shift) then
       begin
         DoCenter := False;
@@ -5857 +5857 @@
   end
   else if (ClientMode <> cEditMap) and (Button = TMouseButton.mbRight) and
-    not(ssShift in Shift) then
+    not (ssShift in Shift) then
   begin
     if Supervising then
@@ -5933 +5933 @@
           DestinationMarkON := False;
           PaintDestination;
-          Status := Status and not(usStay or usRecover or usEnhance) or
+          Status := Status and not (usStay or usRecover or usEnhance) or
             usWaiting;
           MoveToLoc(MouseLoc, False); { goto }
@@ -6244 +6244 @@
               Assert(UnFocus >= 0);
               MyUn[UnFocus].Status := MyUn[UnFocus].Status and
-                not(usStay or usRecover);
+                not (usStay or usRecover);
               for uix := 0 to MyRO.nUn - 1 do
                 if MyUn[uix].Master = UnFocus then
@@ -7400 +7400 @@
   with TUn(MyUn[UnFocus]) do begin
     if (Sender = mUtilize) and
-      not(Server(sRemoveUnit - sExecute, Me, UnFocus, nil^) = eUtilized) then
+      not (Server(sRemoveUnit - sExecute, Me, UnFocus, nil^) = eUtilized) then
     begin
       SimpleMessage(Phrases2.Lookup('SHIP_UTILIZE'));
@@ -7990 +7990 @@
   r0 := CreateRectRgn(Left, Top, Rigth, Bottom);
   for I := 0 to ControlCount - 1 do
-    if not(Controls[I] is TArea) and Controls[I].Visible then
+    if not (Controls[I] is TArea) and Controls[I].Visible then
     begin
       with Controls[I].BoundsRect do
@@ -8045 +8045 @@
       CityRepMask := CityRepMask or (1 shl (Tag shr 8))
     else
-      CityRepMask := CityRepMask and not(1 shl (Tag shr 8));
+      CityRepMask := CityRepMask and not (1 shl (Tag shr 8));
   end;
 end;