Merge pull request #3011 from Mailaender/cloaking

Render mines properly again and fix empty camo pillboxes in RA shellmap
2013-04-08 13:55:23 -07:00
parent 58524a712d e7e74aac3c
commit 8f7819fb24
5 changed files with 1315 additions and 2 deletions
--- a/OpenRA.Mods.RA/Cloak.cs
+++ b/OpenRA.Mods.RA/Cloak.cs
@@ -74,7 +74,10 @@ namespace OpenRA.Mods.RA
 				return r;

 			if (Cloaked && IsVisible(self.World.RenderedShroud, self))
-				return r.Select(a => a.WithPalette(wr.Palette(info.Palette)));
+				if (string.IsNullOrEmpty(info.Palette))
+					return r;
+				else
+					return r.Select(a => a.WithPalette(wr.Palette(info.Palette)));
 			else
 				return Nothing;
 		}