From 3160034d66dfc47a039bd4f0e9be9cd9c2ecf769 Mon Sep 17 00:00:00 2001
From: James Dunne <james.jdunne@gmail.com>
Date: Wed, 27 Jun 2012 23:54:49 -0500
Subject: [PATCH] Now checking AcceptsSmudgeType for all cells to smudge and
 picking appropriate SmudgeLayer to render with.

---
 OpenRA.Mods.RA/Combat.cs | 71 ++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/OpenRA.Mods.RA/Combat.cs b/OpenRA.Mods.RA/Combat.cs
index 539c92db52..b011ba258c 100755
--- a/OpenRA.Mods.RA/Combat.cs
+++ b/OpenRA.Mods.RA/Combat.cs
@@ -49,49 +49,50 @@ namespace OpenRA.Mods.RA
 
 			Sound.Play(GetImpactSound(warhead, isWater), args.dest);
 
-			var smudgeType = world.GetTerrainInfo(targetTile).AcceptsSmudgeType
-				.FirstOrDefault(t => warhead.SmudgeType.Contains(t));
+			var smudgeLayers = world.WorldActor.TraitsImplementing<SmudgeLayer>().ToDictionary(x => x.Info.Type);
 
-			if (smudgeType != null)
+			if (warhead.Size[0] > 0)
 			{
-				var smudgeLayer = world.WorldActor.TraitsImplementing<SmudgeLayer>()
-					.FirstOrDefault(x => x.Info.Type == smudgeType);
-				if (smudgeLayer == null)
-					throw new NotImplementedException("Unknown smudge type `{0}`".F(smudgeType));
+				var resLayer = world.WorldActor.Trait<ResourceLayer>();
+				var allCells = world.FindTilesInCircle(targetTile, warhead.Size[0]).ToList();
 
-				if (warhead.Size[0] > 0)
+				// `smudgeCells` might want to just be an outer shell of the cells:
+				IEnumerable<CPos> smudgeCells = allCells;
+				if (warhead.Size.Length == 2)
+					smudgeCells = smudgeCells.Except(world.FindTilesInCircle(targetTile, warhead.Size[1]));
+
+				// Draw the smudges:
+				foreach (var sc in smudgeCells)
 				{
-					var resLayer = world.WorldActor.Trait<ResourceLayer>();
-					var allCells = world.FindTilesInCircle(targetTile, warhead.Size[0]).ToList();
+					var smudgeType = world.GetTerrainInfo(sc).AcceptsSmudgeType.FirstOrDefault(t => warhead.SmudgeType.Contains(t));
+					if (smudgeType == null) continue;
 
-					// `smudgeCells` might want to just be an outer shell of the cells:
-					IEnumerable<CPos> smudgeCells = allCells;
-					if (warhead.Size.Length == 2)
-						smudgeCells = smudgeCells.Except(world.FindTilesInCircle(targetTile, warhead.Size[1]));
+					SmudgeLayer smudgeLayer;
+					if (!smudgeLayers.TryGetValue(smudgeType, out smudgeLayer))
+						throw new NotImplementedException("Unknown smudge type `{0}`".F(smudgeType));
 
-					// Draw the smudges:
-					foreach (var sc in smudgeCells)
-					{
-						// Water doesn't get scorched/smudged, it just gets superheated =P.
-						if (world.GetTerrainInfo(sc).IsWater) continue;
-
-						smudgeLayer.AddSmudge(sc);
-						if (warhead.Ore)
-							resLayer.Destroy(sc);
-					}
-
-					// Destroy all resources in range, not just the outer shell:
-					foreach (var cell in allCells)
-					{
-						if (warhead.Ore)
-							resLayer.Destroy(cell);
-					}
+					smudgeLayer.AddSmudge(sc);
+					if (warhead.Ore)
+						resLayer.Destroy(sc);
 				}
-				else
+
+				// Destroy all resources in range, not just the outer shell:
+				foreach (var cell in allCells)
 				{
-					// Don't smudge water (if this ever happens):
-					if (!world.GetTerrainInfo(targetTile).IsWater)
-						smudgeLayer.AddSmudge(targetTile);
+					if (warhead.Ore)
+						resLayer.Destroy(cell);
+				}
+			}
+			else
+			{
+				var smudgeType = world.GetTerrainInfo(targetTile).AcceptsSmudgeType.FirstOrDefault(t => warhead.SmudgeType.Contains(t));
+				if (smudgeType != null)
+				{
+					SmudgeLayer smudgeLayer;
+					if (!smudgeLayers.TryGetValue(smudgeType, out smudgeLayer))
+						throw new NotImplementedException("Unknown smudge type `{0}`".F(smudgeType));
+
+					smudgeLayer.AddSmudge(targetTile);
 				}
 			}