Refactor per-player shrouds & fix shellmap shroud.

OpenRA.Game/Graphics/Minimap.cs

@@ -139,7 +139,7 @@ namespace OpenRA.Graphics
 
 				foreach (var t in world.ActorsWithTrait<IRadarSignature>())
 				{
-					if (!world.RenderedShroud.IsVisible(t.Actor))
+					if (world.ShroudObscures(t.Actor))
 						continue;
 
 					var color = t.Trait.RadarSignatureColor(t.Actor);
@@ -158,7 +158,7 @@ namespace OpenRA.Graphics
 			var map = world.Map;
 			var size = Exts.NextPowerOf2(Math.Max(map.Bounds.Width, map.Bounds.Height));
 			var bitmap = new Bitmap(size, size);
-			if (world.RenderedShroud.Disabled)
+			if (world.RenderPlayer == null)
 				return bitmap;
 
 			var bitmapData = bitmap.LockBits(bitmap.Bounds(),
@@ -174,11 +174,10 @@ namespace OpenRA.Graphics
 				for (var x = 0; x < map.Bounds.Width; x++)
 					for (var y = 0; y < map.Bounds.Height; y++)
 					{
-						var mapX = x + map.Bounds.Left;
+						var p = new CPos(x + map.Bounds.Left, y + map.Bounds.Top);
-						var mapY = y + map.Bounds.Top;
+						if (world.ShroudObscures(p))
-						if (!world.RenderedShroud.IsExplored(mapX, mapY))
 							*(c + (y * bitmapData.Stride >> 2) + x) = shroud;
-						else if (!world.RenderedShroud.IsVisible(mapX,mapY))
+						else if (world.FogObscures(p))
 							*(c + (y * bitmapData.Stride >> 2) + x) = fog;
 					}
 			}

OpenRA.Game/Graphics/ShroudRenderer.cs

@@ -15,21 +15,12 @@ namespace OpenRA.Graphics
 {
 	public class ShroudRenderer
 	{
-		World world;
+		Map map;
-		Traits.Shroud shroud {
-			get {
-				return world.RenderedShroud;
-			}
-		}
-		
 		Sprite[] shadowBits = Game.modData.SpriteLoader.LoadAllSprites("shadow");
 		Sprite[,] sprites, fogSprites;
 
-		Map map;
-
 		public ShroudRenderer(World world)
 		{
-			this.world = world;
 			this.map = world.Map;
 
 			sprites = new Sprite[map.MapSize.X, map.MapSize.Y];
@@ -56,58 +47,58 @@ namespace OpenRA.Graphics
 			new byte[] { 46 },
 		};
 
-		Sprite ChooseShroud(int i, int j)
+		Sprite ChooseShroud(Shroud s, int i, int j)
 		{
-			if( !shroud.IsExplored( i, j ) ) return shadowBits[ 0xf ];
+			if (!s.IsExplored(i, j))
+				return shadowBits[0xf];
 
 			// bits are for unexploredness: up, right, down, left
 			var v = 0;
 			// bits are for unexploredness: TL, TR, BR, BL
 			var u = 0;
 
-			if( !shroud.IsExplored( i, j - 1 ) ) { v |= 1; u |= 3; }
+			if (!s.IsExplored(i, j - 1)) { v |= 1; u |= 3; }
-			if( !shroud.IsExplored( i + 1, j ) ) { v |= 2; u |= 6; }
+			if (!s.IsExplored(i + 1, j)) { v |= 2; u |= 6; }
-			if( !shroud.IsExplored( i, j + 1 ) ) { v |= 4; u |= 12; }
+			if (!s.IsExplored(i, j + 1)) { v |= 4; u |= 12; }
-			if( !shroud.IsExplored( i - 1, j ) ) { v |= 8; u |= 9; }
+			if (!s.IsExplored(i - 1, j)) { v |= 8; u |= 9; }
 
 			var uSides = u;
+			if (!s.IsExplored(i - 1, j - 1)) u |= 1;
+			if (!s.IsExplored(i + 1, j - 1)) u |= 2;
+			if (!s.IsExplored(i + 1, j + 1)) u |= 4;
+			if (!s.IsExplored(i - 1, j + 1)) u |= 8;
 
-			if( !shroud.IsExplored( i - 1, j - 1 ) ) u |= 1;
+			return shadowBits[SpecialShroudTiles[u ^ uSides][v]];
-			if( !shroud.IsExplored( i + 1, j - 1 ) ) u |= 2;
-			if( !shroud.IsExplored( i + 1, j + 1 ) ) u |= 4;
-			if( !shroud.IsExplored( i - 1, j + 1 ) ) u |= 8;
-
-			return shadowBits[ SpecialShroudTiles[ u ^ uSides ][ v ] ];
 		}
 
-		Sprite ChooseFog(int i, int j)
+		Sprite ChooseFog(Shroud s, int i, int j)
 		{
-			if (!shroud.IsVisible(i,j)) return shadowBits[0xf];
+			if (!s.IsVisible(i, j)) return shadowBits[0xf];
-			if (!shroud.IsExplored(i, j)) return shadowBits[0xf];
+			if (!s.IsExplored(i, j)) return shadowBits[0xf];
 
 			// bits are for unexploredness: up, right, down, left
 			var v = 0;
 			// bits are for unexploredness: TL, TR, BR, BL
 			var u = 0;
 
-			if (!shroud.IsVisible(i, j - 1)) { v |= 1; u |= 3; }
+			if (!s.IsVisible(i, j - 1)) { v |= 1; u |= 3; }
-			if (!shroud.IsVisible(i + 1, j)) { v |= 2; u |= 6; }
+			if (!s.IsVisible(i + 1, j)) { v |= 2; u |= 6; }
-			if (!shroud.IsVisible(i, j + 1)) { v |= 4; u |= 12; }
+			if (!s.IsVisible(i, j + 1)) { v |= 4; u |= 12; }
-			if (!shroud.IsVisible(i - 1, j)) { v |= 8; u |= 9; }
+			if (!s.IsVisible(i - 1, j)) { v |= 8; u |= 9; }
 
 			var uSides = u;
 
-			if (!shroud.IsVisible(i - 1, j - 1)) u |= 1;
+			if (!s.IsVisible(i - 1, j - 1)) u |= 1;
-			if (!shroud.IsVisible(i + 1, j - 1)) u |= 2;
+			if (!s.IsVisible(i + 1, j - 1)) u |= 2;
-			if (!shroud.IsVisible(i + 1, j + 1)) u |= 4;
+			if (!s.IsVisible(i + 1, j + 1)) u |= 4;
-			if (!shroud.IsVisible(i - 1, j + 1)) u |= 8;
+			if (!s.IsVisible(i - 1, j + 1)) u |= 8;
 
 			return shadowBits[SpecialShroudTiles[u ^ uSides][v]];
 		}
 
 		bool initializePalettes = true;
 		PaletteReference fogPalette, shroudPalette;
-		internal void Draw(WorldRenderer wr)
+		internal void Draw(WorldRenderer wr, Player renderPlayer)
 		{
 			if (initializePalettes)
 			{
@@ -116,18 +107,42 @@ namespace OpenRA.Graphics
 				initializePalettes = false;
 			}
 
-			if (shroud != null && shroud.dirty)
+			if (renderPlayer == null)
 			{
-				shroud.dirty = false;
+				// Players with no shroud see the whole map so we only need to set the edges
-				for (int i = map.Bounds.Left; i < map.Bounds.Right; i++)
+				var b = map.Bounds;
-					for (int j = map.Bounds.Top; j < map.Bounds.Bottom; j++)
+				for (int i = b.Left; i < b.Right; i++)
-						sprites[i, j] = ChooseShroud(i, j);
+					for (int j = b.Top; j < b.Bottom; j++)
+					{
+						var v = 0;
+						var u = 0;
 
-				for (int i = map.Bounds.Left; i < map.Bounds.Right; i++)
+						if (j == b.Top) { v |= 1; u |= 3; }
-					for (int j = map.Bounds.Top; j < map.Bounds.Bottom; j++)
+						if (i == b.Right - 1) { v |= 2; u |= 6; }
-						fogSprites[i, j] = ChooseFog(i, j);
+						if (j == b.Bottom - 1) { v |= 4; u |= 12; }
+						if (i == b.Left) { v |= 8; u |= 9; }
+
+						var uSides = u;
+						if (i == b.Left && j == b.Top) u |= 1;
+						if (i == b.Right - 1 && j == b.Top) u |= 2;
+						if (i == b.Right - 1 && j == b.Bottom - 1) u |= 4;
+						if (i == b.Left && j == b.Bottom - 1) u |= 8;
+
+						sprites[i, j] = fogSprites[i, j] = shadowBits[SpecialShroudTiles[u ^ uSides][v]];
 					}
+			}
+			else
+			{
+				renderPlayer.Shroud.dirty = false;
 
+				for (int i = map.Bounds.Left; i < map.Bounds.Right; i++)
+					for (int j = map.Bounds.Top; j < map.Bounds.Bottom; j++)
+						sprites[i, j] = ChooseShroud(renderPlayer.Shroud, i, j);
+
+				for (int i = map.Bounds.Left; i < map.Bounds.Right; i++)
+					for (int j = map.Bounds.Top; j < map.Bounds.Bottom; j++)
+						fogSprites[i, j] = ChooseFog(renderPlayer.Shroud, i, j);
+			}
 			var clipRect = Game.viewport.WorldBounds(wr.world);
 			DrawShroud(wr, clipRect, sprites, shroudPalette);
 			if (wr.world.WorldActor.HasTrait<Fog>())

OpenRA.Game/Graphics/TerrainRenderer.cs

@@ -72,9 +72,9 @@ namespace OpenRA.Graphics
 			if (firstRow < 0) firstRow = 0;
 			if (lastRow > map.Bounds.Height) lastRow = map.Bounds.Height;
 
-			if (world.RenderedPlayer != null && !world.RenderedShroud.Disabled && world.RenderedShroud.Bounds.HasValue)
+			if (world.VisibleBounds.HasValue)
 			{
-				var r = world.RenderedShroud.Bounds.Value;
+				var r = world.VisibleBounds.Value;
 				if (firstRow < r.Top - map.Bounds.Top)
 					firstRow = r.Top - map.Bounds.Top;
 

OpenRA.Game/Graphics/Viewport.cs

@@ -196,7 +196,7 @@ namespace OpenRA.Graphics
 				cachedScroll = scrollPosition;
 			}
 
-			var b = world.RenderedShroud.Bounds;
+			var b = world.VisibleBounds;
 			return (b.HasValue) ? Rectangle.Intersect(cachedRect, b.Value) : cachedRect;
 		}
 	}

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -127,7 +127,7 @@ namespace OpenRA.Graphics
 			if (world.OrderGenerator != null)
 				world.OrderGenerator.RenderAfterWorld(this, world);
 
-			shroudRenderer.Draw( this );
+			shroudRenderer.Draw(this, world.RenderPlayer);
 			Game.Renderer.DisableScissor();
 
 			foreach (var g in world.Selection.Actors.Where(a => !a.Destroyed)

OpenRA.Game/Player.cs

@@ -92,5 +92,10 @@ namespace OpenRA
 		}
 
 		public Dictionary<Player, Stance> Stances = new Dictionary<Player, Stance>();
+		public bool IsAlliedWith(Player p)
+		{
+			// Observers are considered as allies
+			return p == null || Stances[p] == Stance.Ally;
+		}
 	}
 }

OpenRA.Game/Traits/SelectionDecorations.cs

@@ -54,7 +54,8 @@ namespace OpenRA.Traits
 
 		void DrawPips(WorldRenderer wr, Actor self, float2 basePosition)
 		{
-			if (self.Owner != self.World.RenderedPlayer) return;
+			if (self.Owner != self.World.RenderPlayer)
+				return;
 
 			var pipSources = self.TraitsImplementing<IPips>();
 			if (pipSources.Count() == 0)
@@ -95,7 +96,8 @@ namespace OpenRA.Traits
 
 		void DrawTags(WorldRenderer wr, Actor self, float2 basePosition)
 		{
-			if (self.Owner != self.World.RenderedPlayer) return;
+			if (self.Owner != self.World.RenderPlayer)
+			    return;
 
 			// If a mod wants to implement a unit with multiple tags, then they are placed on multiple rows
 			var tagxyBase = basePosition + new float2(-16, 2); // Correct for the offset in the shp file

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -86,7 +86,7 @@ namespace OpenRA.Traits
 		Color RadarSignatureColor(Actor self);
 	}
 
-	public interface IVisibilityModifier { bool IsVisible(Shroud s, Actor self); }
+	public interface IVisibilityModifier { bool IsVisible(Actor self, Player byPlayer); }
 	public interface IRadarColorModifier { Color RadarColorOverride(Actor self); }
 	public interface IHasLocation { PPos PxPosition { get; } }
 

OpenRA.Game/Traits/World/ResourceLayer.cs

@@ -40,7 +40,7 @@ namespace OpenRA.Traits
 			for (int x = clip.Left; x < clip.Right; x++)
 				for (int y = clip.Top; y < clip.Bottom; y++)
 				{
-					if (!world.RenderedShroud.IsExplored(new CPos(x, y)))
+					if (world.ShroudObscures(new CPos(x, y)))
 						continue;
 
 					var c = content[x, y];

OpenRA.Game/Traits/World/Shroud.cs

@@ -23,7 +23,6 @@ namespace OpenRA.Traits
 	public class Shroud : ISync
 	{
 		Map map;
-		World world;
 
 		[Sync] public Player Owner;
 		public int[,] visibleCells;
@@ -38,11 +37,6 @@ namespace OpenRA.Traits
 			set { disabled = value; Dirty(); }
 		}
 
-		public bool Observing
-		{
-			get { return world.IsShellmap || (world.LocalPlayer == null && Owner == null);; }
-		}
-
 		public Rectangle? Bounds
 		{
 			get { return Disabled ? null : exploredBounds; }
@@ -52,7 +46,6 @@ namespace OpenRA.Traits
 
 		public Shroud(World world)
 		{
-			this.world = world;
 			map = world.Map;
 			visibleCells = new int[map.MapSize.X, map.MapSize.Y];
 			exploredCells = new bool[map.MapSize.X, map.MapSize.Y];
@@ -274,16 +267,24 @@ namespace OpenRA.Traits
 			if (!map.IsInMap(x, y))
 				return false;
 
-			if (Disabled || Observing)
+			if (Disabled)
 				return true;
 
 			return foggedCells[x,y];
 		}
 
+		public bool IsExplored(Actor a)
+		{
+			if (Owner == null)
+				return true;
+
+			return GetVisOrigins(a).Any(o => IsExplored(o));
+		}
+
 		public bool IsVisible(CPos xy) { return IsVisible(xy.X, xy.Y); }
 		public bool IsVisible(int x, int y)
 		{
-			if (Disabled || Observing)
+			if (Disabled)
 				return true;
 
 			// Visibility is allowed to extend beyond the map cordon so that
@@ -298,16 +299,14 @@ namespace OpenRA.Traits
 		public bool IsVisible(Actor a)
 		{
 			// I need to pass in the current shroud, otherwise we're just checking that true==true
-			if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(this, a)))
+			if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(a, Owner)))
 				return false;
 
-			if(Owner == null) return true;
+			return Disabled || a.Owner.Stances[Owner] == Stance.Ally || IsExplored(a);
-
-			return Disabled || Observing || a.Owner.Stances[Owner] == Stance.Ally || GetVisOrigins(a).Any(o => IsExplored(o));
 		}
 
 		public bool IsTargetable(Actor a) {
-			if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(this, a)))
+			if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(a, Owner)))
 				return false;
 
 			return GetVisOrigins(a).Any(o => IsVisible(o));

OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs

@@ -184,7 +184,7 @@ namespace OpenRA.Widgets
 		IEnumerable<Actor> SelectActorsInBox(World world, PPos a, PPos b, Func<Actor, bool> cond)
 		{
 			return world.FindUnits(a, b)
-				.Where(x => x.HasTrait<Selectable>() && world.RenderedShroud.IsVisible(x) && cond(x))
+				.Where(x => x.HasTrait<Selectable>() && !world.FogObscures(x) && cond(x))
 				.GroupBy(x => x.GetSelectionPriority())
 				.OrderByDescending(g => g.Key)
 				.Select(g => g.AsEnumerable())

OpenRA.Game/World.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using OpenRA.Effects;
 using OpenRA.FileFormats;
@@ -40,11 +41,25 @@ namespace OpenRA
 
 		public void AddPlayer(Player p) { Players.Add(p); }
 		public Player LocalPlayer { get; private set; }
-		public readonly Shroud LocalShroud;
 		public bool Observer { get { return LocalPlayer == null; } }
-		public Player RenderedPlayer;
-		public Shroud RenderedShroud { get { return RenderedPlayer != null ? RenderedPlayer.Shroud : LocalShroud; } }
 
+		Player renderPlayer;
+		public Player RenderPlayer
+		{
+			get { return renderPlayer; }
+			set
+			{
+				renderPlayer = value;
+				if (renderPlayer != null)
+					renderPlayer.Shroud.Dirty();
+			}
+		}
+
+		public Rectangle? VisibleBounds { get { return renderPlayer != null ? renderPlayer.Shroud.Bounds : null; } }
+		public bool FogObscures(Actor a) { return renderPlayer != null && !renderPlayer.Shroud.IsVisible(a); }
+		public bool FogObscures(CPos p) { return renderPlayer != null && !renderPlayer.Shroud.IsVisible(p); }
+		public bool ShroudObscures(Actor a) { return renderPlayer != null && !renderPlayer.Shroud.IsExplored(a); }
+		public bool ShroudObscures(CPos p) { return renderPlayer != null && !renderPlayer.Shroud.IsExplored(p); }
 
 		public void SetLocalPlayer(string pr)
 		{
@@ -52,7 +67,7 @@ namespace OpenRA
 				return;
 
 	 		LocalPlayer = Players.FirstOrDefault(p => p.InternalName == pr);
-			RenderedPlayer = LocalPlayer;
+			RenderPlayer = LocalPlayer;
 		}
 
 		public readonly Actor WorldActor;
@@ -104,7 +119,6 @@ namespace OpenRA
 			SharedRandom = new XRandom(orderManager.LobbyInfo.GlobalSettings.RandomSeed);
 
 			WorldActor = CreateActor( "World", new TypeDictionary() );
-			LocalShroud = WorldActor.Trait<Shroud>();
 			ActorMap = new ActorMap(this);
 
 			// Add players

OpenRA.Game/WorldUtils.cs

@@ -24,7 +24,7 @@ namespace OpenRA
 		public static IEnumerable<Actor> FindUnitsAtMouse(this World world, int2 mouseLocation)
 		{
 			var loc = Game.viewport.ViewToWorldPx(mouseLocation);
-			return FindUnits(world, loc, loc).Where(a => world.RenderedShroud.IsVisible(a));
+			return FindUnits(world, loc, loc).Where(a => !world.FogObscures(a));
 		}
 
 		public static IEnumerable<Actor> FindUnits(this World world, PPos a, PPos b)

OpenRA.Mods.RA/Buildings/BaseProvider.cs

@@ -60,7 +60,7 @@ namespace OpenRA.Mods.RA.Buildings
 		public void RenderBeforeWorld(WorldRenderer wr, Actor self)
 		{
 			// Visible to player and allies
-			if (self.World.RenderedPlayer != null && self.Owner.Stances[self.World.RenderedPlayer] != Stance.Ally)
+			if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
 				return;
 
 			wr.DrawRangeCircleWithContrast(
@@ -73,7 +73,7 @@ namespace OpenRA.Mods.RA.Buildings
 		public float GetValue()
 		{
 			// Visible to player and allies
-			if (self.World.RenderedPlayer != null && self.Owner.Stances[self.World.RenderedPlayer] != Stance.Ally)
+			if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
 				return 0f;
 
 			// Ready or delay disabled

OpenRA.Mods.RA/Buildings/BibLayer.cs

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.RA.Buildings
 			{
 				if (!cliprect.Contains(kv.Key.X, kv.Key.Y))
 					continue;
-				if (!world.RenderedShroud.IsExplored(kv.Key))
+				if (world.ShroudObscures(kv.Key))
 					continue;
 
 				bibSprites[kv.Value.type - 1][kv.Value.index].DrawAt(wr, kv.Key.ToPPos().ToFloat2(), "terrain");

OpenRA.Mods.RA/Cloak.cs

@@ -73,7 +73,7 @@ namespace OpenRA.Mods.RA
 			if (remainingTime > 0)
 				return r;
 
-			if (Cloaked && IsVisible(self.World.RenderedShroud, self))
+			if (Cloaked && IsVisible(self, self.World.RenderPlayer))
 				if (string.IsNullOrEmpty(info.Palette))
 					return r;
 				else
@@ -97,17 +97,12 @@ namespace OpenRA.Mods.RA
 			}
 		}
 		
-		public bool IsVisible(Shroud s, Actor self)
+		public bool IsVisible(Actor self, Player byPlayer)
 		{
-			if (!Cloaked)
+			if (!Cloaked || self.Owner.IsAlliedWith(byPlayer))
-				return true;
-
-			if (s.Observing)
-				return true;
-			if (s.Owner != null)
-				if (self.Owner == s.Owner || self.Owner.Stances[s.Owner] == Stance.Ally)
 				return true;
 
+			// TODO: Change this to be per-player? A cloak detector revealing to everyone is dumb
 			return self.World.ActorsWithTrait<DetectCloaked>().Any(a =>
 				a.Actor.Owner.Stances[self.Owner] != Stance.Ally &&
 				(self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<DetectCloakedInfo>().Range);

OpenRA.Mods.RA/Effects/Bullet.cs

@@ -160,7 +160,8 @@ namespace OpenRA.Mods.RA.Effects
 				var altitude = float2.Lerp(Args.srcAltitude, Args.destAltitude, at);
 				var pos = float2.Lerp(Args.src.ToFloat2(), Args.dest.ToFloat2(), at) - new float2(0, altitude);
 
-				if (Args.firedBy.World.RenderedShroud.IsVisible(((PPos) pos.ToInt2()).ToCPos()))
+				var cell = ((PPos)pos.ToInt2()).ToCPos();
+				if (!Args.firedBy.World.FogObscures(cell))
 				{
 					if (Info.High || Info.Angle > 0)
 					{

OpenRA.Mods.RA/Effects/Contrail.cs

@@ -93,8 +93,8 @@ namespace OpenRA.Mods.RA
 				var conPos = WPos.Average(positions[i], positions[i-1], positions[i-2], positions[i-3]);
 				var nextPos = WPos.Average(positions[i-1], positions[i-2], positions[i-3], positions[i-4]);
 
-				if (self.World.RenderedShroud.IsVisible(new CPos(conPos)) ||
+				if (!self.World.FogObscures(new CPos(conPos)) &&
-				    self.World.RenderedShroud.IsVisible(new CPos(nextPos)))
+				    !self.World.FogObscures(new CPos(nextPos)))
 				{
 					Game.Renderer.WorldLineRenderer.DrawLine(wr.ScreenPosition(conPos), wr.ScreenPosition(nextPos), trailStart, trailEnd);
 

OpenRA.Mods.RA/Effects/GpsDot.cs

@@ -69,7 +69,7 @@ namespace OpenRA.Mods.RA.Effects
 			}
 
 			var hasGps = (watcher != null && (watcher.Granted || watcher.GrantedAllies));
-			var hasDot = (huf != null && !huf.IsVisible(self.World.RenderedShroud, self)); // WRONG (why?)
+			var hasDot = (huf != null && !huf.IsVisible(self, self.World.RenderPlayer));
 			var dotHidden = (cloak != null && cloak.Cloaked) || (spy != null && spy.Disguised);
 
 			show = hasGps && hasDot && !dotHidden;

OpenRA.Mods.RA/Effects/Missile.cs

@@ -158,7 +158,7 @@ namespace OpenRA.Mods.RA.Effects
 
 		public IEnumerable<Renderable> Render(WorldRenderer wr)
 		{
-			if (Args.firedBy.World.RenderedShroud.IsVisible(PxPosition.ToCPos()))
+			if (!Args.firedBy.World.FogObscures(PxPosition.ToCPos()))
 				yield return new Renderable(anim.Image, PxPosition.ToFloat2() - 0.5f * anim.Image.size - new float2(0, Altitude),
 					wr.Palette(Args.weapon.Underwater ? "shadow" : "effect"), PxPosition.Y);
 

OpenRA.Mods.RA/MPStartLocations.cs

@@ -47,10 +47,11 @@ namespace OpenRA.Mods.RA
 			}
 
 			// Explore allied shroud
-			foreach (var p in Start)
+			var explore = world.WorldActor.Info.Traits.Get<MPStartLocationsInfo>().InitialExploreRange;
-				if ((world.LocalPlayer != null ) &&(p.Key == world.LocalPlayer || p.Key.Stances[world.LocalPlayer] == Stance.Ally))
+			foreach (var p in Start.Keys)
-					world.WorldActor.Trait<Shroud>().Explore(world, p.Value,
+				foreach (var q in world.Players)
-						world.WorldActor.Info.Traits.Get<MPStartLocationsInfo>().InitialExploreRange);
+					if (p.IsAlliedWith(q))
+						q.Shroud.Explore(world, Start[p], explore);
 
 			// Set viewport
 			if (world.LocalPlayer != null && Start.ContainsKey(world.LocalPlayer))

OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs

@@ -19,15 +19,15 @@ namespace OpenRA.Mods.RA
 
 	class FrozenUnderFog : IRenderModifier, IVisibilityModifier
 	{
-		public bool IsVisible(Shroud s, Actor self)
+		public bool IsVisible(Actor self, Player byPlayer)
 		{
-			return Shroud.GetVisOrigins(self).Any(o => s.IsVisible(o));
+			return byPlayer == null || Shroud.GetVisOrigins(self).Any(o => byPlayer.Shroud.IsVisible(o));
 		}
 
 		Renderable[] cache = { };
 		public IEnumerable<Renderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<Renderable> r)
 		{
-			if (IsVisible(self.World.RenderedShroud, self))
+			if (IsVisible(self, self.World.RenderPlayer))
 				cache = r.ToArray();
 			return cache;
 		}

OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs

@@ -19,15 +19,15 @@ namespace OpenRA.Mods.RA
 
 	class HiddenUnderFog : IRenderModifier, IVisibilityModifier
 	{
-		public bool IsVisible(Shroud s, Actor self)
+		public bool IsVisible(Actor self, Player byPlayer)
 		{
-			return Shroud.GetVisOrigins(self).Any(o => s.IsVisible(o));
+			return byPlayer == null || Shroud.GetVisOrigins(self).Any(o => byPlayer.Shroud.IsVisible(o));
 		}
 
 		static Renderable[] Nothing = { };
 		public IEnumerable<Renderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<Renderable> r)
 		{
-			return IsVisible(self.World.RenderedShroud, self) ? r : Nothing;
+			return IsVisible(self, self.World.RenderPlayer) ? r : Nothing;
 		}
 	}
 }

OpenRA.Mods.RA/ProductionBar.cs

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA
 		public float GetValue()
 		{
 			// only people we like should see our production status.
-			if (self.World.RenderedPlayer != null && self.Owner.Stances[self.World.RenderedPlayer] != Stance.Ally)
+			if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
 				return 0;
 
 			var queue = self.TraitsImplementing<ProductionQueue>().FirstOrDefault(q => q.CurrentItem() != null);

OpenRA.Mods.RA/SmokeTrailWhenDamaged.cs

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.RA
 			{
 				var position = self.CenterPosition;
 				if (position.Z > 0 && self.GetDamageState() >= DamageState.Heavy &&
-				    self.World.RenderedShroud.IsVisible(new CPos(position)))
+				    !self.World.FogObscures(new CPos(position)))
 				{
 					var offset = info.Offset.Rotate(coords.QuantizeOrientation(self, self.Orientation));
 					var pos = PPos.FromWPosHackZ(position + coords.LocalToWorld(offset));

OpenRA.Mods.RA/Widgets/Logic/ObserverShroudSelectorLogic.cs

@@ -40,16 +40,16 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 		{
 			var views = world.Players.Where(p => !p.NonCombatant).ToDictionary(p => p.PlayerName,
 				p => new CameraOption("{0}'s view".F(p.PlayerName),
-				      () => world.RenderedPlayer == p,
+				      () => world.RenderPlayer == p,
-				      () => { world.RenderedPlayer = p; world.RenderedShroud.Dirty(); }
+				      () => world.RenderPlayer = p
 			));
 			views.Add("", new CameraOption("World view",
-				() => world.RenderedPlayer == null,
+				() => world.RenderPlayer == null,
-				() => { world.RenderedPlayer = null; world.RenderedShroud.Dirty(); }
+				() => world.RenderPlayer = null
 			));
 
 			var shroudSelector = widget.Get<DropDownButtonWidget>("SHROUD_SELECTOR");
-			shroudSelector.GetText = () => views[world.RenderedPlayer == null ? "" : world.RenderedPlayer.PlayerName].Label;
+			shroudSelector.GetText = () => views[world.RenderPlayer == null ? "" : world.RenderPlayer.PlayerName].Label;
 			shroudSelector.OnMouseDown = _ =>
 			{
 				Func<CameraOption, ScrollItemWidget, ScrollItemWidget> setupItem = (option, template) =>

OpenRA.Mods.RA/Widgets/WorldTooltipWidget.cs

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA.Widgets
 			var cell = Game.viewport.ViewToWorld(Viewport.LastMousePos);
 			if (!world.Map.IsInMap(cell)) return;
 
-			if (world.LocalPlayer != null && !world.RenderedShroud.IsExplored(cell))
+			if (world.LocalPlayer != null && world.ShroudObscures(cell))
 			{
 				var utext = "Unexplored Terrain";
 				var usz = Game.Renderer.Fonts["Bold"].Measure(utext) + new int2(20, 24);

OpenRA.Mods.RA/World/SmudgeLayer.cs

@@ -78,12 +78,12 @@ namespace OpenRA.Mods.RA
 		public void Render( WorldRenderer wr )
 		{
 			var cliprect = Game.viewport.WorldBounds(world);
-			var localPlayer = world.LocalPlayer;
 			foreach (var kv in tiles)
 			{
 				if (!cliprect.Contains(kv.Key.X,kv.Key.Y))
 					continue;
-				if (localPlayer != null && !world.RenderedShroud.IsExplored(kv.Key))
+
+				if (world.ShroudObscures(kv.Key))
 					continue;
 
 				smudgeSprites[kv.Value.type- 1][kv.Value.index].DrawAt(wr, kv.Key.ToPPos().ToFloat2(), "terrain");

mods/cnc-classic/rules/system.yaml

@@ -204,7 +204,6 @@ World:
 	SpawnMPUnits:
 	SpatialBins:
 		BinSize: 4
-	Shroud:
 	PathFinder:
 	ValidateOrder:
 	DebugPauseState:

mods/cnc/rules/system.yaml

@@ -306,7 +306,6 @@ World:
 	MPStartLocations:
 	SpatialBins:
 		BinSize: 4
-	Shroud:
 	Fog:
 	CrateSpawner:
 		Minimum: 1

mods/d2k/rules/system.yaml

@@ -388,7 +388,6 @@ World:
 		Faction: ordos
 	SpatialBins:
 		BinSize: 4
-	Shroud:
 	Fog:
 	PathFinder:
 	ValidateOrder:

mods/ra-classic/rules/system.yaml

@@ -236,7 +236,6 @@ World:
 	SpawnMPUnits:
 	SpatialBins:
 		BinSize: 4
-	Shroud:
 	PathFinder:
 	ValidateOrder:
 	DebugPauseState:

mods/ra/rules/system.yaml

@@ -621,7 +621,6 @@ World:
 	SpawnMPUnits:
 	SpatialBins:
 		BinSize: 4
-	Shroud:
 	Fog:
 	PathFinder:
 	ValidateOrder: