epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Map.Contains check grid type once.

Browse Source
This commit is contained in:
Vapre
2021-07-23 23:12:17 +02:00
committed by abcdefg30
parent dcaa658678
commit 2e6f444285
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Game/Map/Map.cs
View File

@@ -788,16 +788,21 @@ namespace OpenRA
public bool Contains(CPos cell) public bool Contains(CPos cell)
{ {
// .ToMPos() returns the same result if the X and Y coordinates if (Grid.Type == MapGridType.RectangularIsometric)
// are switched. X < Y is invalid in the RectangularIsometric coordinate system, {
// so we pre-filter these to avoid returning the wrong result // .ToMPos() returns the same result if the X and Y coordinates
if (Grid.Type == MapGridType.RectangularIsometric && cell.X < cell.Y) // are switched. X < Y is invalid in the RectangularIsometric coordinate system,
return false; // so we pre-filter these to avoid returning the wrong result
if (cell.X < cell.Y)
// If the mod uses flat & rectangular maps, ToMPos and Contains(MPos) create unnecessary cost. return false;
// Just check if CPos is within map bounds. }
if (Grid.MaximumTerrainHeight == 0 && Grid.Type == MapGridType.Rectangular) else
return Bounds.Contains(cell.X, cell.Y); {
// If the mod uses flat & rectangular maps, ToMPos and Contains(MPos) create unnecessary cost.
// Just check if CPos is within map bounds.
if (Grid.MaximumTerrainHeight == 0)
return Bounds.Contains(cell.X, cell.Y);
}
return Contains(cell.ToMPos(this)); return Contains(cell.ToMPos(this));
} }