Merge pull request #11592 from reaperrr/fix-smudges

Fix smudges spawning/growing on cells occupied by structures or vehicles
This commit is contained in:
Matthias Mailänder
2016-07-09 20:51:39 +02:00
committed by GitHub
24 changed files with 143 additions and 79 deletions

View File

@@ -38,7 +38,12 @@ namespace OpenRA.Mods.Common.Warheads
foreach (var sc in allCells)
{
var smudgeType = world.Map.GetTerrainInfo(sc).AcceptsSmudgeType.FirstOrDefault(SmudgeType.Contains);
if (smudgeType == null) continue;
if (smudgeType == null)
continue;
var cellActors = world.ActorMap.GetActorsAt(sc);
if (cellActors.Any(a => !IsValidAgainst(a, firedBy)))
continue;
SmudgeLayer smudgeLayer;
if (!smudgeLayers.TryGetValue(smudgeType, out smudgeLayer))