Changeset 558 for trunk


Ignore:
Timestamp:
Apr 25, 2024, 6:31:34 PM (8 months ago)
Author:
chronos
Message:
  • Modified: Code cleanup.
Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/CityProcessing.pas

    r550 r558  
    738738    begin { all citizens were working -- worst tile no longer exploited }
    739739      Assert(1 shl V21 and Tiles <> 0);
    740       Tiles := Tiles and not(1 shl V21);
     740      Tiles := Tiles and not (1 shl V21);
    741741      UsedByCity[TileLoc] := -1;
    742742    end
    … …  
    751751      begin { disorder -- don't exploit tile }
    752752        Assert(1 shl V21 and Tiles <> 0);
    753         Tiles := Tiles and not(1 shl V21);
     753        Tiles := Tiles and not (1 shl V21);
    754754        UsedByCity[TileLoc] := -1;
    755755      end;
    … …  
    841841        and (FoodSurplus < 2)) and (FoodSurplus > 0) then
    842842        Inc(Money, FoodSurplus)
    843       else if not(Disorder and (FoodSurplus > 0)) then
     843      else if not (Disorder and (FoodSurplus > 0)) then
    844844      begin { calculate new food storage }
    845845        Food := Food + FoodSurplus;

  • trunk/Database.pas

    r550 r558  
    889889  for I := 0 to 11 do
    890890  begin
    891     RealMap[RareLoc[I]] := RealMap[RareLoc[I]] and not(fTerrain or fSpecial) or
     891    RealMap[RareLoc[I]] := RealMap[RareLoc[I]] and not (fTerrain or fSpecial) or
    892892      (fDesert or fDeadLands);
    893893    for dy := -1 to 1 do
    … …  
    14891489  begin
    14901490    RealMap[StartLoc0[p1]] := RealMap[StartLoc0[p1]] and
    1491       not(fTerrain or fSpecial) or fGrass or fSpecial1;
     1491      not (fTerrain or fSpecial) or fGrass or fSpecial1;
    14921492    CntGood := 1;
    14931493    CntGoodGrass := 1;
    … …  
    15121512          then
    15131513          begin
    1514             RealMap[Loc1] := RealMap[Loc1] and not(fTerrain or fSpecial)
     1514            RealMap[Loc1] := RealMap[Loc1] and not (fTerrain or fSpecial)
    15151515              or fGrass;
    15161516            RealMap[Loc1] := RealMap[Loc1] or ActualSpecialTile(Loc1) shl 5;
    … …  
    16981698          ResourceMask[P] := $FFFFFFFF
    16991699        else
    1700           ResourceMask[P] := $FFFFFFFF and not(fSpecial2 or fModern);
     1700          ResourceMask[P] := $FFFFFFFF and not (fSpecial2 or fModern);
    17011701        GrWallContinent[P] := -1;
    17021702
    … …  
    18991899  if Terrain[NewTile and fTerrain].IrrEff = 0 then
    19001900  begin
    1901     NewTile := NewTile and not(fPrefStartPos or fStartPos);
     1901    NewTile := NewTile and not (fPrefStartPos or fStartPos);
    19021902    if (NewTile and fTerImp = tiIrrigation) or (NewTile and fTerImp = tiFarm)
    19031903    then
    … …  
    21102110          Inc(TestDet, 1 shl 28)
    21112111        else if (Domain = dGround) and (PModel.Cap[mcFanatic] > 0) and
    2112           not(RW[Defender].Government in [gRepublic, gDemocracy, gFuture]) then
     2112          not (RW[Defender].Government in [gRepublic, gDemocracy, gFuture]) then
    21132113          Inc(TestDet, 4 shl 28) // fanatic ground units always defend
    21142114        else if PModel.Flags and mdZOC <> 0 then
    … …  
    24272427      Inc(Discovered[pTell]);
    24282428    if euix >= -1 then
    2429       Map[Loc] := Map[Loc] and not(fUnit or fCity or fOwned or fOwnZoCUnit) or
     2429      Map[Loc] := Map[Loc] and not (fUnit or fCity or fOwned or fOwnZoCUnit) or
    24302430        (Tile and $07FFFFFF or AddFlags) and
    24312431        (fUnit or fCity or fOwned or fOwnZoCUnit)
    … …  
    24392439      MapObservedLast[Loc] := GTurn
    24402440    end;
    2441     ObserveLevel[Loc] := ObserveLevel[Loc] and not(3 shl (2 * pTell)) or
     2441    ObserveLevel[Loc] := ObserveLevel[Loc] and not (3 shl (2 * pTell)) or
    24422442      Cardinal(Level) shl (2 * pTell);
    24432443  end;
    … …  
    26532653        else if (Occupant[Loc] <> P) or CityChange then
    26542654        begin // city or enemy unit update necessary, call DiscoverTile
    2655           ObserveLevel[Loc] := ObserveLevel[Loc] and not(3 shl (2 * P));
     2655          ObserveLevel[Loc] := ObserveLevel[Loc] and not (3 shl (2 * P));
    26562656          DiscoverTile(Loc, P, P, OldLevel, False, euix);
    26572657        end
    … …  
    30033003  begin
    30043004    Job := jNone;
    3005     Flags := Flags and not(unFortified or unMountainDelay);
     3005    Flags := Flags and not (unFortified or unMountainDelay);
    30063006    Loc0 := Loc;
    30073007  end;
    … …  
    31393139      dxdy(UsedByCity[FoundLoc], FoundLoc, dx, dy);
    31403140      V21 := (dy + 3) shl 2 + (dx + 3) shr 1;
    3141       RW[p1].City[cix1].Tiles := RW[p1].City[cix1].Tiles and not(1 shl V21);
     3141      RW[p1].City[cix1].Tiles := RW[p1].City[cix1].Tiles and not (1 shl V21);
    31423142    end;
    31433143    Tiles := 1 shl 13; { exploit central tile }
    … …  
    32323232    V21_to_Loc(Loc, Radius);
    32333233    for V21 := 1 to 26 do
    3234       if Tiles and (1 shl V21) and not(1 shl CityOwnTile) <> 0 then
     3234      if Tiles and (1 shl V21) and not (1 shl CityOwnTile) <> 0 then
    32353235      begin
    32363236        Loc1 := Radius[V21];
    … …  
    32393239          (RW[pNew].Treaty[Occupant[Loc1]] < trAlliance) then
    32403240        begin // tile can't remain exploited
    3241           Tiles := Tiles and not(1 shl V21);
     3241          Tiles := Tiles and not (1 shl V21);
    32423242          UsedByCity[Loc1] := -1;
    32433243        end;
    … …  
    33023302        RealMap[Loc] := RealMap[Loc] and not fTerrain or
    33033303          Cardinal(ChangedTerrain);
    3304         RealMap[Loc] := RealMap[Loc] and not(3 shl 5) or
     3304        RealMap[Loc] := RealMap[Loc] and not (3 shl 5) or
    33053305          ActualSpecialTile(Loc) shl 5;
    33063306      end;
    … …  
    33143314        RealMap[Loc] := RealMap[Loc] and not fTerrain or
    33153315          Cardinal(ChangedTerrain);
    3316         RealMap[Loc] := RealMap[Loc] and not(3 shl 5) or
     3316        RealMap[Loc] := RealMap[Loc] and not (3 shl 5) or
    33173317          ActualSpecialTile(Loc) shl 5;
    33183318      end;
    … …  
    33283328        RealMap[Loc] := RealMap[Loc] and not fTerrain or
    33293329          Cardinal(ChangedTerrain);
    3330         RealMap[Loc] := RealMap[Loc] and not(3 shl 5) or
     3330        RealMap[Loc] := RealMap[Loc] and not (3 shl 5) or
    33313331          ActualSpecialTile(Loc) shl 5;
    3332         if not(RealMap[Loc] and fTerrain in TerrType_Canalable) then
     3332        if not (RealMap[Loc] and fTerrain in TerrType_Canalable) then
    33333333        begin
    33343334          RemoveDomainUnits(dSea, P, Loc);
    … …  
    33763376        (ObserveLevel[Loc] shr (2 * p1) and 3 > lNoObserve) then
    33773377        RW[p1].Map[Loc] := RW[p1].Map[Loc] and
    3378           not(fTerrain or fSpecial or fTerImp or fRoad or fRR or fCanal or
     3378          not (fTerrain or fSpecial or fTerImp or fRoad or fRR or fCanal or
    33793379          fPoll) or RealMap[Loc] and (fTerrain or fSpecial or fTerImp or
    33803380          fRoad or fRR or fCanal or fPoll);
    … …  
    35643564            RW[pTarget].EnemyCity[cix].Loc := -1;
    35653565
    3566       Tile := Tile and (not(fSpecial or fModern) or ResourceMask[pTarget]);
     3566      Tile := Tile and (not (fSpecial or fModern) or ResourceMask[pTarget]);
    35673567      Tile := Tile or (RW[pTarget].Map[Loc] and fModern);
    35683568      if (Tile and fTerrain = RW[pTarget].Map[Loc] and fTerrain) then
    … …  
    35733573      RW[pTarget].Map[Loc] := RW[pTarget].Map[Loc] and fInEnemyZoC
    35743574      // always preserve this flag!
    3575         or Tile and not(fUnit or fHiddenUnit or fStealthUnit or fObserved or
     3575        or Tile and not (fUnit or fHiddenUnit or fStealthUnit or fObserved or
    35763576        fSpiedOut or fOwned or fInEnemyZoC or fOwnZoCUnit or fPeace or fGrWall);
    35773577      if RW[pSender].Territory[Loc] <> RW[pTarget].Territory[Loc] then
    … …  
    36643664              RecalcMapZoC(pTarget);
    36653665            end;
    3666             if not(NewTreaty in [trPeace, TrFriendlyContact]) then
     3666            if not (NewTreaty in [trPeace, TrFriendlyContact]) then
    36673667            begin
    36683668              RW[pSender].EvaStart[pTarget] := -PeaceEvaTurns - 1;
    … …  
    39103910      begin
    39113911        for I := 0 to nAdv - 1 do // give all techs to player p1
    3912           if not(I in FutureTech) and (RW[p1].Tech[I] < tsApplicable) then
     3912          if not (I in FutureTech) and (RW[p1].Tech[I] < tsApplicable) then
    39133913          begin
    39143914            RW[p1].Tech[I] := tsCheat;

  • trunk/GameServer.pas

    r550 r558  
    602602          ($7F01FFFF or fPrefStartPos or fStartPos) or ($F shl 27);
    603603        if RealMap[Loc1] and (fTerrain or fSpecial) = fSwamp or fSpecial2 then
    604           RealMap[Loc1] := RealMap[Loc1] and not(fTerrain or fSpecial) or
     604          RealMap[Loc1] := RealMap[Loc1] and not (fTerrain or fSpecial) or
    605605            (fSwamp or fSpecial1);
    606606        if (RealMap[Loc1] and fDeadLands <> 0) and
    607607          (RealMap[Loc1] and fTerrain <> fArctic) then
    608           RealMap[Loc1] := RealMap[Loc1] and not(fTerrain or fSpecial)
     608          RealMap[Loc1] := RealMap[Loc1] and not (fTerrain or fSpecial)
    609609            or fDesert;
    610610      end;
    … …  
    16471647            V21_to_Loc(Loc, Radius);
    16481648            for V21 := 1 to 26 do
    1649               if Tiles and (1 shl V21) and not(1 shl CityOwnTile) <> 0 then
     1649              if Tiles and (1 shl V21) and not (1 shl CityOwnTile) <> 0 then
    16501650              begin
    16511651                Loc1 := Radius[V21];
    … …  
    16581658                  (Treaty[Occupant[Loc1]] < trPeace) then
    16591659                begin
    1660                   Tiles := Tiles and not(1 shl V21);
     1660                  Tiles := Tiles and not (1 shl V21);
    16611661                  UsedByCity[Loc1] := -1;
    16621662                  Flags := Flags or chSiege;
    … …  
    17931793      begin // nation made extinct
    17941794        Happened := Happened or phExtinct;
    1795         GAlive := GAlive and not(1 shl pTurn);
     1795        GAlive := GAlive and not (1 shl pTurn);
    17961796        Stat[stPop, pTurn, GTurn] := 0;
    17971797        Stat[stMil, pTurn, GTurn] := 0;
    … …  
    18731873          end;
    18741874      end;
    1875       if WinOnAlone and (GAlive and not(1 shl pTurn or 1) = 0) then
     1875      if WinOnAlone and (GAlive and not (1 shl pTurn or 1) = 0) then
    18761876        GWinner := 1 shl pTurn; // break if only one nation left
    18771877
    … …  
    21752175          GiveCivilReport(P, MoveInfo.Defender);
    21762176          for I := 0 to nAdv - 1 do
    2177             if not(I in FutureTech) and (RW[P].Tech[I] < tsSeen) and
     2177            if not (I in FutureTech) and (RW[P].Tech[I] < tsSeen) and
    21782178              (RW[MoveInfo.Defender].Tech[I] >= tsApplicable) then
    21792179            begin
    … …  
    21852185        if Mode = moPlaying then
    21862186          LogCheckBorders(P, nCity - 1, MoveInfo.Defender);
    2187 {$IFOPT O-} if Mode < moPlaying then
    2188           InvalidTreatyMap := not(1 shl P); {$ENDIF}
     2187{$IFOPT O-}
     2188        if Mode < moPlaying then
     2189          InvalidTreatyMap := not (1 shl P);
     2190{$ENDIF}
    21892191        // territory should not be considered for the rest of the command
    21902192        // execution, because during loading a game it's incorrect before
    … …  
    41134115        if (Subject >= RW[Player].nUn) or (RW[Player].Un[Subject].Loc < 0) then
    41144116          Result := eInvalid
    4115         else if not(RW[Player].Model[RW[Player].Un[Subject].mix].Kind
     4117        else if not (RW[Player].Model[RW[Player].Un[Subject].mix].Kind
    41164118          in [mkSettler, mkSlaves]) and
    41174119          (RW[Player].Un[Subject].Flags and unConscripts = 0) then
    … …  
    44254427        begin
    44264428          if (OldImp < 0) or (OldImp >= nImp) or
    4427             not(Imp[OldImp].Kind in [ikCommon, ikNatLocal, ikNatGlobal]) then
     4429            not (Imp[OldImp].Kind in [ikCommon, ikNatLocal, ikNatGlobal]) then
    44284430            Result := eInvalid
    44294431          else
    44304432            with RW[Player].City[Subject] do
    44314433              if (Built[OldImp] = 0) or (Project and cpImp = 0) or
    4432                 not(Imp[Project and cpIndex].Kind in [ikCommon, ikNatLocal,
     4434                not (Imp[Project and cpIndex].Kind in [ikCommon, ikNatLocal,
    44334435                ikNatGlobal]) then
    44344436                Result := eInvalid

  • trunk/LocalPlayer/CityType.pas

    r536 r558  
    158158  nPool := 0;
    159159  for iix := nWonder to nImp - 1 do
    160     if not(iix in Listed) and (Imp[iix].Kind = ikCommon) and (iix <> imTrGoods)
     160    if not (iix in Listed) and (Imp[iix].Kind = ikCommon) and (iix <> imTrGoods)
    161161      and (Imp[iix].Preq <> preNA) and
    162162      ((Imp[iix].Preq = preNone) or (MyRO.Tech[Imp[iix].Preq] >= tsApplicable))

  • trunk/LocalPlayer/Draft.pas

    r550 r558  
    419419    else
    420420      Result := 30000 + AdvValue[FeaturePreq];
    421     if not(fix in AutoFeature) then
     421    if not (fix in AutoFeature) then
    422422      Inc(Result, 90000);
    423423  end;
    … …  
    449449function TDraftDlg.IsFeatureInList(D, I: Integer): Boolean;
    450450begin
    451   Result := not(I in AutoFeature) and (1 shl D and Feature[I].Domains <> 0) and
     451  Result := not (I in AutoFeature) and (1 shl D and Feature[I].Domains <> 0) and
    452452    (Feature[I].Preq <> preNA) and
    453453    ((Feature[I].Preq = preNone) or (Feature[I].Preq = preSun) and
    … …  
    531531      if (X >= xFeature - 21) and (X < ClientWidth) and (ssShift in Shift) then
    532532        MainScreen.HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkFeature, Code[I])
    533       else if not(Code[I] in AutoFeature) then
     533      else if not (Code[I] in AutoFeature) then
    534534      begin
    535535        if (Code[I] < mcFirstNonCap) and (X >= xFeature - 21) and

  • trunk/LocalPlayer/Enhance.pas

    r531 r558  
    360360    if NewJob in [jIrr, jFarm, jTrans] then
    361361      RemoveJob(jMine);
    362     if (NewJob = jRR) and not(jRoad in Done) then
     362    if (NewJob = jRR) and not (jRoad in Done) then
    363363    begin
    364364      MyData.EnhancementJobs[Page, Stage] := jRoad;
    365365      Inc(Stage);
    366366    end;
    367     if (NewJob = jFarm) and not(jIrr in Done) then
     367    if (NewJob = jFarm) and not (jIrr in Done) then
    368368    begin
    369369      MyData.EnhancementJobs[Page, Stage] := jIrr;

  • trunk/LocalPlayer/Nego.pas

    r549 r558  
    373373  begin // check techs
    374374    for I := 0 to nAdv - 1 do
    375       if not(I in FutureTech) then
     375      if not (I in FutureTech) then
    376376        if (MyRO.Tech[I] < tsSeen) and
    377377          (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] >= tsApplicable) then
    … …  
    732732    end;
    733733    Price := ButtonPrice[TButtonN(Sender).Tag and $FF];
    734     if not(Price shr 24 in OppoAllowed) then
     734    if not (Price shr 24 in OppoAllowed) then
    735735      Exit;
    736736    case Price of
    … …  
    845845    end;
    846846    Price := ButtonPrice[TButtonN(Sender).Tag and $FF];
    847     if not(Price shr 24 in MyAllowed) then
     847    if not (Price shr 24 in MyAllowed) then
    848848      Exit;
    849849    case Price of
    … …  
    936936    Exit;
    937937  NewCommand := TButtonN(Sender).Tag and $FF + scDipStart;
    938   if not(NewCommand - scDipStart in CommandAllowed) then
     938  if not (NewCommand - scDipStart in CommandAllowed) then
    939939    Exit;
    940940  if (NewCommand = scDipCancelTreaty) and

  • trunk/LocalPlayer/Select.pas

    r550 r558  
    139139procedure TListDlg.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
    140140begin
    141   CanClose := Closable or not(Kind in MustChooseKind);
     141  CanClose := Closable or not (Kind in MustChooseKind);
    142142end;
    143143
    … …  
    918918  then
    919919    Include(Shift, ssShift); // don't close list window
    920   if (ssLeft in Shift) and not(ssShift in Shift) then
     920  if (ssLeft in Shift) and not (ssShift in Shift) then
    921921  begin
    922922    if Selected <> -2 then
    … …  
    10891089            TryAddImpLine(0, I + cpImp);
    10901090        for I := nWonder to nImp - 1 do
    1091           if not(Imp[I].Kind in [ikCommon, ikTrGoods]) and
     1091          if not (Imp[I].Kind in [ikCommon, ikTrGoods]) and
    10921092            ((MyRO.NatBuilt[I] = 0) or (Imp[I].Kind = ikNatLocal)) then
    10931093            TryAddImpLine(0, I + cpImp);
    … …  
    11821182        Inc(Lines[0]);
    11831183        for I := 0 to nAdv - 1 do
    1184           if not(I in FutureTech) and (MyRO.Tech[I] < tsApplicable) and
     1184          if not (I in FutureTech) and (MyRO.Tech[I] < tsApplicable) and
    11851185            ((AdvValue[I] < 2000) or (MyRO.Tech[adMassProduction] > tsNA)) and
    11861186            ((AdvValue[I] < 1000) or (MyRO.Tech[adScience] > tsNA)) then
    … …  
    11941194      begin
    11951195        for I := 0 to nAdv - 1 do
    1196           if not(I in FutureTech) and (MyRO.Tech[I] >= tsApplicable) and
     1196          if not (I in FutureTech) and (MyRO.Tech[I] >= tsApplicable) and
    11971197            (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] < tsSeen) then
    11981198          begin
    … …  
    12101210      begin
    12111211        for I := 0 to nAdv - 1 do
    1212           if not(I in FutureTech) and (MyRO.Tech[I] < tsSeen) and
     1212          if not (I in FutureTech) and (MyRO.Tech[I] < tsSeen) and
    12131213            (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] >= tsApplicable) then
    12141214          begin
    … …  
    17431743      ShowFocus := False;
    17441744      for I := 0 to nAdv - 1 do
    1745         if not(I in FutureTech) and (MyRO.Tech[I] < tsApplicable) and
     1745        if not (I in FutureTech) and (MyRO.Tech[I] < tsApplicable) and
    17461746          ((AdvValue[I] < 2000) or (MyRO.Tech[adMassProduction] > tsNA)) and
    17471747          ((AdvValue[I] < 1000) or (MyRO.Tech[adScience] > tsNA)) and
    … …  
    17531753  ToggleBtn.Visible := (Kind = kCities) and not Supervising or (Kind = kAdvance)
    17541754    and ShowFocus or (Kind = kModels) or (Kind = kEModels);
    1755   CloseBtn.Visible := not(Kind in MustChooseKind);
     1755  CloseBtn.Visible := not (Kind in MustChooseKind);
    17561756
    17571757  inherited ShowNewContent(NewMode, ForceClose);

  • trunk/LocalPlayer/Term.pas

    r552 r558  
    19911991              for I := 0 to nShipPart - 1 do
    19921992                if MyRO.Ship[p1].Parts[I] < ShipNeed[I] then
    1993                   Winners := Winners and not(1 shl p1);
     1993                  Winners := Winners and not (1 shl p1);
    19941994            end;
    19951995          Assert(Winners <> 0);
    … …  
    31043104          else if CurrentMoveInfo.IsAlly then
    31053105            CurrentMoveInfo.DoShow :=
    3106               not(mAlNoMoves.Checked or mAlEffectiveMovesOnly.Checked)
     3106              not (mAlNoMoves.Checked or mAlEffectiveMovesOnly.Checked)
    31073107          else
    31083108            CurrentMoveInfo.DoShow :=
    3109               not(mEnNoMoves.Checked or mEnAttacks.Checked);
     3109              not (mEnNoMoves.Checked or mEnAttacks.Checked);
    31103110        end;
    31113111        // else keep DoShow from cShowMove/cShowAttack
    … …  
    32113211            else if CurrentMoveInfo.IsAlly then
    32123212              CurrentMoveInfo.DoShow := not mAlNoMoves.Checked and
    3213                 not(mAlEffectiveMovesOnly.Checked and
     3213                not (mAlEffectiveMovesOnly.Checked and
    32143214                (Command <> cShowCapturing))
    32153215            else
    32163216              CurrentMoveInfo.DoShow := not mEnNoMoves.Checked and
    3217                 not(mEnAttacks.Checked and (Command <> cShowCapturing));
     3217                not (mEnAttacks.Checked and (Command <> cShowCapturing));
    32183218            if CurrentMoveInfo.DoShow then
    32193219            begin
    … …  
    38043804    else
    38053805      Destination := Status shr 16;
    3806     Status := Status and not(usStay or usRecover) or usWaiting;
     3806    Status := Status and not (usStay or usRecover) or usWaiting;
    38073807    MoveToLoc(Destination, True);
    38083808  end;
    … …  
    38373837    else
    38383838    begin
    3839       Status := Status and not(usStay or usRecover or usEnhance);
     3839      Status := Status and not (usStay or usRecover or usEnhance);
    38403840      MoveToLoc(maNextCity, True);
    38413841    end;
    … …  
    57295729  if (MouseLoc < 0) or (MouseLoc >= G.lx * G.ly) then
    57305730    Exit;
    5731   if (Button = TMouseButton.mbLeft) and not(ssShift in Shift) then
     5731  if (Button = TMouseButton.mbLeft) and not (ssShift in Shift) then
    57325732  begin
    57335733    DoCenter := True;
    … …  
    57535753        if MyMap[MouseLoc] and (fDeadLands or fModern) = BrushType and
    57545754          (fDeadLands or fModern) then
    5755           EditTileData.NewTile := MyMap[MouseLoc] and not(fDeadLands or fModern)
     5755          EditTileData.NewTile := MyMap[MouseLoc] and not (fDeadLands or fModern)
    57565756        else
    5757           EditTileData.NewTile := MyMap[MouseLoc] and not(fDeadLands or fModern)
     5757          EditTileData.NewTile := MyMap[MouseLoc] and not (fDeadLands or fModern)
    57585758            or BrushType
    57595759      else if BrushType and fTerImp <> 0 then
    … …  
    57665766          (fPrefStartPos or fStartPos) then
    57675767          EditTileData.NewTile := MyMap[MouseLoc] and
    5768             not(fPrefStartPos or fStartPos)
     5768            not (fPrefStartPos or fStartPos)
    57695769        else
    57705770          EditTileData.NewTile := MyMap[MouseLoc] and
    5771             not(fPrefStartPos or fStartPos) or BrushType
     5771            not (fPrefStartPos or fStartPos) or BrushType
    57725772      else
    57735773        EditTileData.NewTile := MyMap[MouseLoc] xor BrushType;
    … …  
    58395839        PanelPaint;
    58405840      end // own unit
    5841       else if (MyMap[MouseLoc] and fSpiedOut <> 0) and not(ssCtrl in Shift) then
     5841      else if (MyMap[MouseLoc] and fSpiedOut <> 0) and not (ssCtrl in Shift) then
    58425842      begin
    58435843        DoCenter := False;
    … …  
    58575857  end
    58585858  else if (ClientMode <> cEditMap) and (Button = TMouseButton.mbRight) and
    5859     not(ssShift in Shift) then
     5859    not (ssShift in Shift) then
    58605860  begin
    58615861    if Supervising then
    … …  
    59335933          DestinationMarkON := False;
    59345934          PaintDestination;
    5935           Status := Status and not(usStay or usRecover or usEnhance) or
     5935          Status := Status and not (usStay or usRecover or usEnhance) or
    59365936            usWaiting;
    59375937          MoveToLoc(MouseLoc, False); { goto }
    … …  
    62446244              Assert(UnFocus >= 0);
    62456245              MyUn[UnFocus].Status := MyUn[UnFocus].Status and
    6246                 not(usStay or usRecover);
     6246                not (usStay or usRecover);
    62476247              for uix := 0 to MyRO.nUn - 1 do
    62486248                if MyUn[uix].Master = UnFocus then
    … …  
    74007400  with TUn(MyUn[UnFocus]) do begin
    74017401    if (Sender = mUtilize) and
    7402       not(Server(sRemoveUnit - sExecute, Me, UnFocus, nil^) = eUtilized) then
     7402      not (Server(sRemoveUnit - sExecute, Me, UnFocus, nil^) = eUtilized) then
    74037403    begin
    74047404      SimpleMessage(Phrases2.Lookup('SHIP_UTILIZE'));
    … …  
    79907990  r0 := CreateRectRgn(Left, Top, Rigth, Bottom);
    79917991  for I := 0 to ControlCount - 1 do
    7992     if not(Controls[I] is TArea) and Controls[I].Visible then
     7992    if not (Controls[I] is TArea) and Controls[I].Visible then
    79937993    begin
    79947994      with Controls[I].BoundsRect do
    … …  
    80458045      CityRepMask := CityRepMask or (1 shl (Tag shr 8))
    80468046    else
    8047       CityRepMask := CityRepMask and not(1 shl (Tag shr 8));
     8047      CityRepMask := CityRepMask and not (1 shl (Tag shr 8));
    80488048  end;
    80498049end;

  • trunk/Messg.pas

    r554 r558  
    5656begin
    5757  Button1.Visible := True;
    58   Button2.Visible := not(Kind in [mkOK]);
     58  Button2.Visible := not (Kind in [mkOK]);
    5959  if Button2.Visible then
    6060    Button1.Left := 101

  • trunk/Packages/CevoComponents/BaseWin.pas

    r496 r558  
    263263    ClientHeight - BottomFrame);
    264264  for I := 0 to ControlCount - 1 do
    265     if not(Controls[I] is TArea) and Controls[I].Visible then
     265    if not (Controls[I] is TArea) and Controls[I].Visible then
    266266    begin
    267267      with Controls[I].BoundsRect do

  • trunk/UnitProcessing.pas

    r550 r558  
    596596    MultiDamage := 2;
    597597    if (ABaseDamage = HealthAtt) and (PModel.Cap[mcFanatic] > 0) and
    598       not(RW[pAtt].Government in [gRepublic, gDemocracy, gFuture]) then
     598      not (RW[pAtt].Government in [gRepublic, gDemocracy, gFuture]) then
    599599      MultiDamage := MultiDamage * 2; // fanatic attacker died
    600600    EndHealthDef := RW[Defender].Un[Duix].Health - MultiDamage *
    … …  
    608608    begin
    609609      if (DModel.Cap[mcFanatic] > 0) and
    610         not(RW[Defender].Government in [gRepublic, gDemocracy, gFuture]) then
     610        not (RW[Defender].Government in [gRepublic, gDemocracy, gFuture]) then
    611611        MultiDamage := MultiDamage * 2; // fanatic defender died
    612612      if PModel.Cap[mcFirst] > 0 then
    … …  
    13591359      if Result = eCity then
    13601360      begin
    1361         ObserveLevel[Loc0] := ObserveLevel[Loc0] and not(3 shl (2 * P));
     1361        ObserveLevel[Loc0] := ObserveLevel[Loc0] and not (3 shl (2 * P));
    13621362        Discover21(Loc0, P, lObserveUnhidden, True, True);
    13631363        // CheckContact;
    … …  
    13831383            Health := Health - HostileDamage(P, mix, Loc, ToWork[Loc, Job]);
    13841384          Dec(Movement, ToWork[Loc, Job]);
    1385           if not(Job in [jCity, jPillage, jPoll]) then
     1385          if not (Job in [jCity, jPillage, jPoll]) then
    13861386            Inc(Worked[P], ToWork[Loc, Job]);
    13871387          if Job = jCity then
    … …  
    14001400            end;
    14011401{$IFOPT O-} if Mode < moPlaying then
    1402               InvalidTreatyMap := not(1 shl P); {$ENDIF}
     1402              InvalidTreatyMap := not (1 shl P); {$ENDIF}
    14031403            // territory should not be considered for the rest of the command
    14041404            // execution, because during loading a game it's incorrect before
    … …  
    14171417        begin
    14181418          Dec(ToWork[Loc, Job], Movement);
    1419           if not(Job in [jCity, jPillage, jPoll]) then
     1419          if not (Job in [jCity, jPillage, jPoll]) then
    14201420            Inc(Worked[P], Movement);
    14211421          Health := Health - HostileDamage(P, mix, Loc, Movement);
Note: See TracChangeset for help on using the changeset viewer.