Changeset 558 for trunk/LocalPlayer/Term.pas

Timestamp:

Apr 25, 2024, 6:31:34 PM (12 days ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/LocalPlayer/Term.pas (modified) (15 diffs)

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;