Changeset 558 for trunk/LocalPlayer/Term.pas
- Timestamp:
- Apr 25, 2024, 6:31:34 PM (7 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LocalPlayer/Term.pas
r552 r558 1991 1991 for I := 0 to nShipPart - 1 do 1992 1992 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); 1994 1994 end; 1995 1995 Assert(Winners <> 0); … … 3104 3104 else if CurrentMoveInfo.IsAlly then 3105 3105 CurrentMoveInfo.DoShow := 3106 not (mAlNoMoves.Checked or mAlEffectiveMovesOnly.Checked)3106 not (mAlNoMoves.Checked or mAlEffectiveMovesOnly.Checked) 3107 3107 else 3108 3108 CurrentMoveInfo.DoShow := 3109 not (mEnNoMoves.Checked or mEnAttacks.Checked);3109 not (mEnNoMoves.Checked or mEnAttacks.Checked); 3110 3110 end; 3111 3111 // else keep DoShow from cShowMove/cShowAttack … … 3211 3211 else if CurrentMoveInfo.IsAlly then 3212 3212 CurrentMoveInfo.DoShow := not mAlNoMoves.Checked and 3213 not (mAlEffectiveMovesOnly.Checked and3213 not (mAlEffectiveMovesOnly.Checked and 3214 3214 (Command <> cShowCapturing)) 3215 3215 else 3216 3216 CurrentMoveInfo.DoShow := not mEnNoMoves.Checked and 3217 not (mEnAttacks.Checked and (Command <> cShowCapturing));3217 not (mEnAttacks.Checked and (Command <> cShowCapturing)); 3218 3218 if CurrentMoveInfo.DoShow then 3219 3219 begin … … 3804 3804 else 3805 3805 Destination := Status shr 16; 3806 Status := Status and not (usStay or usRecover) or usWaiting;3806 Status := Status and not (usStay or usRecover) or usWaiting; 3807 3807 MoveToLoc(Destination, True); 3808 3808 end; … … 3837 3837 else 3838 3838 begin 3839 Status := Status and not (usStay or usRecover or usEnhance);3839 Status := Status and not (usStay or usRecover or usEnhance); 3840 3840 MoveToLoc(maNextCity, True); 3841 3841 end; … … 5729 5729 if (MouseLoc < 0) or (MouseLoc >= G.lx * G.ly) then 5730 5730 Exit; 5731 if (Button = TMouseButton.mbLeft) and not (ssShift in Shift) then5731 if (Button = TMouseButton.mbLeft) and not (ssShift in Shift) then 5732 5732 begin 5733 5733 DoCenter := True; … … 5753 5753 if MyMap[MouseLoc] and (fDeadLands or fModern) = BrushType and 5754 5754 (fDeadLands or fModern) then 5755 EditTileData.NewTile := MyMap[MouseLoc] and not (fDeadLands or fModern)5755 EditTileData.NewTile := MyMap[MouseLoc] and not (fDeadLands or fModern) 5756 5756 else 5757 EditTileData.NewTile := MyMap[MouseLoc] and not (fDeadLands or fModern)5757 EditTileData.NewTile := MyMap[MouseLoc] and not (fDeadLands or fModern) 5758 5758 or BrushType 5759 5759 else if BrushType and fTerImp <> 0 then … … 5766 5766 (fPrefStartPos or fStartPos) then 5767 5767 EditTileData.NewTile := MyMap[MouseLoc] and 5768 not (fPrefStartPos or fStartPos)5768 not (fPrefStartPos or fStartPos) 5769 5769 else 5770 5770 EditTileData.NewTile := MyMap[MouseLoc] and 5771 not (fPrefStartPos or fStartPos) or BrushType5771 not (fPrefStartPos or fStartPos) or BrushType 5772 5772 else 5773 5773 EditTileData.NewTile := MyMap[MouseLoc] xor BrushType; … … 5839 5839 PanelPaint; 5840 5840 end // own unit 5841 else if (MyMap[MouseLoc] and fSpiedOut <> 0) and not (ssCtrl in Shift) then5841 else if (MyMap[MouseLoc] and fSpiedOut <> 0) and not (ssCtrl in Shift) then 5842 5842 begin 5843 5843 DoCenter := False; … … 5857 5857 end 5858 5858 else if (ClientMode <> cEditMap) and (Button = TMouseButton.mbRight) and 5859 not (ssShift in Shift) then5859 not (ssShift in Shift) then 5860 5860 begin 5861 5861 if Supervising then … … 5933 5933 DestinationMarkON := False; 5934 5934 PaintDestination; 5935 Status := Status and not (usStay or usRecover or usEnhance) or5935 Status := Status and not (usStay or usRecover or usEnhance) or 5936 5936 usWaiting; 5937 5937 MoveToLoc(MouseLoc, False); { goto } … … 6244 6244 Assert(UnFocus >= 0); 6245 6245 MyUn[UnFocus].Status := MyUn[UnFocus].Status and 6246 not (usStay or usRecover);6246 not (usStay or usRecover); 6247 6247 for uix := 0 to MyRO.nUn - 1 do 6248 6248 if MyUn[uix].Master = UnFocus then … … 7400 7400 with TUn(MyUn[UnFocus]) do begin 7401 7401 if (Sender = mUtilize) and 7402 not (Server(sRemoveUnit - sExecute, Me, UnFocus, nil^) = eUtilized) then7402 not (Server(sRemoveUnit - sExecute, Me, UnFocus, nil^) = eUtilized) then 7403 7403 begin 7404 7404 SimpleMessage(Phrases2.Lookup('SHIP_UTILIZE')); … … 7990 7990 r0 := CreateRectRgn(Left, Top, Rigth, Bottom); 7991 7991 for I := 0 to ControlCount - 1 do 7992 if not (Controls[I] is TArea) and Controls[I].Visible then7992 if not (Controls[I] is TArea) and Controls[I].Visible then 7993 7993 begin 7994 7994 with Controls[I].BoundsRect do … … 8045 8045 CityRepMask := CityRepMask or (1 shl (Tag shr 8)) 8046 8046 else 8047 CityRepMask := CityRepMask and not (1 shl (Tag shr 8));8047 CityRepMask := CityRepMask and not (1 shl (Tag shr 8)); 8048 8048 end; 8049 8049 end;
Note:
See TracChangeset
for help on using the changeset viewer.