Changeset 550 for trunk/UnitProcessing.pas
- Timestamp:
- Apr 22, 2024, 10:17:01 PM (7 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/UnitProcessing.pas
r447 r550 293 293 end 294 294 else if (PModel.Attack = 0) and 295 not ((PModel.Cap[mcBombs] > 0) and (Flags and unBombsLoaded <> 0))295 not ((PModel.Cap[mcBombs] > 0) and (Flags and unBombsLoaded <> 0)) 296 296 then 297 297 begin … … 495 495 Exit; 496 496 end; 497 if (PModel.Attack = 0) and not ((PModel.Cap[mcBombs] > 0) and497 if (PModel.Attack = 0) and not ((PModel.Cap[mcBombs] > 0) and 498 498 (FlagsAtt and unBombsLoaded <> 0) and (DModel.Domain < dAir)) then 499 499 begin … … 890 890 ToTile := Map[Loc1]; 891 891 if (Loc1 = A.ToLoc) and (ToTile and (fUnit or fOwned) = fUnit) and 892 not ((MoveInfo and 3 = gmaSea) and (FromTile and fTerrain >= fGrass))893 and not ((MoveInfo and 3 = gmaAir) and ((FromTile and fCity <> 0) or892 not ((MoveInfo and 3 = gmaSea) and (FromTile and fTerrain >= fGrass)) 893 and not ((MoveInfo and 3 = gmaAir) and ((FromTile and fCity <> 0) or 894 894 (FromTile and fTerImp = tiBase))) then 895 895 begin // attack position found … … 1309 1309 TerrType := RealMap[Loc0] and fTerrain; 1310 1310 if (RealMap[Loc0] and fCity <> 0) or (TerrType < fGrass) or (Master >= 0) or 1311 not ((NewJob = jPillage) and (RW[P].Model[mix].Domain = dGround) or1311 not ((NewJob = jPillage) and (RW[P].Model[mix].Domain = dGround) or 1312 1312 (RW[P].Model[mix].Kind = mkSettler) or (NewJob <> jCity) and 1313 1313 (RW[P].Model[mix].Kind = mkSlaves) and (GWonder[woPyramids].EffectiveOwner
Note:
See TracChangeset
for help on using the changeset viewer.