Merge pull request OpenRA#5967 from obrakmann/fix5651

pchote · pchote · commit 58abd45ed9fe · 2014-07-18T20:36:02.000+12:00
Fix aircraft losing selection outside the map borders
diff --git a/OpenRA.Game/Selection.cs b/OpenRA.Game/Selection.cs
@@ -61,7 +61,7 @@ public void Combine(World world, IEnumerable<Actor> newSelection, bool isCombine
 
 		public void Tick(World world)
 		{
-			actors.RemoveAll(a => !a.IsInWorld || world.FogObscures(a));
+			actors.RemoveAll(a => !a.IsInWorld || (a.Owner != world.LocalPlayer && world.FogObscures(a)));
 
 			foreach (var cg in controlGroups.Values)
 				// note: NOT `!a.IsInWorld`, since that would remove things that are in transports.
@@ -88,7 +88,7 @@ public void DoControlGroup(World world, WorldRenderer worldRenderer, int group,
 				return;
 			}
 
-			var groupActors = controlGroups[group].Where(a => !a.IsDead() && !world.FogObscures(a));
+			var groupActors = controlGroups[group].Where(a => !a.IsDead());
 
 			if (mods.HasModifier(Modifiers.Alt) || MultiTapCount >= 2)
 			{

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public void Combine(World world, IEnumerable<Actor> newSelection, bool isCombine`
`61`	`61`
`62`	`62`	`public void Tick(World world)`
`63`	`63`	`{`
`64`		`- actors.RemoveAll(a => !a.IsInWorld \|\| world.FogObscures(a));`
	`64`	`+ actors.RemoveAll(a => !a.IsInWorld \|\| (a.Owner != world.LocalPlayer && world.FogObscures(a)));`
`65`	`65`
`66`	`66`	`foreach (var cg in controlGroups.Values)`
`67`	`67`	// note: NOT `!a.IsInWorld`, since that would remove things that are in transports.
`@@ -88,7 +88,7 @@ public void DoControlGroup(World world, WorldRenderer worldRenderer, int group,`
`88`	`88`	`return;`
`89`	`89`	`}`
`90`	`90`
`91`		`- var groupActors = controlGroups[group].Where(a => !a.IsDead() && !world.FogObscures(a));`
	`91`	`+ var groupActors = controlGroups[group].Where(a => !a.IsDead());`
`92`	`92`
`93`	`93`	`if (mods.HasModifier(Modifiers.Alt) \|\| MultiTapCount >= 2)`
`94`	`94`	`{`