epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6074 from deniz1a/chrono-curtain-select

Browse Source 
Fixes #5166
This commit is contained in:
Matthias Mailänder
2014-07-26 17:41:30 +02:00
parent c67414c4f1 943848e853
commit a57c9c5cf3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
View File

@@ -124,7 +124,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world) public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world)
{ {
var xy = wr.Viewport.ViewToWorld(Viewport.LastMousePos); var xy = wr.Viewport.ViewToWorld(Viewport.LastMousePos);
var targetUnits = power.UnitsInRange(xy); var targetUnits = power.UnitsInRange(xy).Where(a => !world.FogObscures(a));
foreach (var unit in targetUnits) foreach (var unit in targetUnits)
if (manager.self.Owner.Shroud.IsTargetable(unit)) if (manager.self.Owner.Shroud.IsTargetable(unit))

5
OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs
View File

@@ -101,7 +101,8 @@ namespace OpenRA.Mods.RA
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world) public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world)
{ {
var xy = wr.Viewport.ViewToWorld(Viewport.LastMousePos); var xy = wr.Viewport.ViewToWorld(Viewport.LastMousePos);
foreach (var unit in power.UnitsInRange(xy)) var targetUnits = power.UnitsInRange(xy).Where(a => a.Owner.Stances[power.self.Owner] == Stance.Ally);
foreach (var unit in targetUnits)
yield return new SelectionBoxRenderable(unit, Color.Red); yield return new SelectionBoxRenderable(unit, Color.Red);
} }
@@ -116,7 +117,7 @@ namespace OpenRA.Mods.RA
public string GetCursor(World world, CPos xy, MouseInput mi) public string GetCursor(World world, CPos xy, MouseInput mi)
{ {
return power.UnitsInRange(xy).Any() ? "ability" : "move-blocked"; return power.UnitsInRange(xy).Any(a => a.Owner.Stances[power.self.Owner] == Stance.Ally) ? "ability" : "move-blocked";
} }
} }
} }