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

Merge pull request #10702 from RoosterDragon/map-contains-fix

Browse Source 
Fix Map.Contains for maps with height
This commit is contained in:
Matthias Mailänder
2016-02-06 23:02:56 +01:00
parent a6e98620c0 36e09990ca
commit 60e86f73d0
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -768,7 +768,12 @@ namespace OpenRA
if (Grid.MaximumTerrainHeight == 0) if (Grid.MaximumTerrainHeight == 0)
return Contains((PPos)uv); return Contains((PPos)uv);
foreach (var puv in ProjectedCellsCovering(uv)) // If the cell has no valid projection, then we're off the map.
var projectedCells = ProjectedCellsCovering(uv);
if (projectedCells.Length == 0)
return false;
foreach (var puv in projectedCells)
if (!Contains(puv)) if (!Contains(puv))
return false; return false;
return true; return true;

8
OpenRA.Game/Traits/Player/FrozenActorLayer.cs
View File

@@ -65,17 +65,15 @@ namespace OpenRA.Traits
.ToArray(); .ToArray();
if (Footprint.Length == 0) if (Footprint.Length == 0)
throw new ArgumentException(("This frozen actor has no footprint! Please report a bug!\n" + throw new ArgumentException(("This frozen actor has no footprint.\n" +
"Actor Name: {0}\n" + "Actor Name: {0}\n" +
"Actor Location: {1}\n" + "Actor Location: {1}\n" +
"Input footprint: [{2}]\n" + "Input footprint: [{2}]\n" +
"Input footprint (shroud.Contains): [{3}]\n" + "Input footprint (after shroud.Contains): [{3}]")
"Input footprint (map.Contains): [{4}]")
.F(actor.Info.Name, .F(actor.Info.Name,
actor.Location.ToString(), actor.Location.ToString(),
footprint.Select(p => p.ToString()).JoinWith("|"), footprint.Select(p => p.ToString()).JoinWith("|"),
footprint.Select(p => shroud.Contains(p).ToString()).JoinWith("|"), footprint.Select(p => shroud.Contains(p).ToString()).JoinWith("|")));
footprint.Select(p => actor.World.Map.Contains(p).ToString()).JoinWith("|")));
CenterPosition = self.CenterPosition; CenterPosition = self.CenterPosition;
Bounds = self.Bounds; Bounds = self.Bounds;