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

LocalPlayer.Shroud is never the right shroud.

Browse Source
This commit is contained in:
Paul Chote
2013-04-10 21:42:30 +12:00
parent 248e815d99
commit 9b7bb53287
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Widgets/CncWorldInteractionControllerWidget.cs
View File

@@ -66,7 +66,7 @@ namespace OpenRA.Mods.Cnc.Widgets
if (!world.Map.IsInMap(cell)) if (!world.Map.IsInMap(cell))
return; return;
if (world.LocalPlayer != null && !world.LocalPlayer.Shroud.IsExplored(cell)) if (world.ShroudObscures(cell))
{ {
TooltipType = WorldTooltipType.Unexplored; TooltipType = WorldTooltipType.Unexplored;
return; return;

4
OpenRA.Mods.RA/Move/Mobile.cs
View File

@@ -485,10 +485,10 @@ namespace OpenRA.Mods.RA.Move
IsQueued = forceQueued; IsQueued = forceQueued;
cursor = "move"; cursor = "move";
if (self.World.LocalPlayer.Shroud.IsExplored(location)) if (self.Owner.Shroud.IsExplored(location))
cursor = self.World.GetTerrainInfo(location).CustomCursor ?? cursor; cursor = self.World.GetTerrainInfo(location).CustomCursor ?? cursor;
if (!self.World.Map.IsInMap(location) || (self.World.LocalPlayer.Shroud.IsExplored(location) && if (!self.World.Map.IsInMap(location) || (self.Owner.Shroud.IsExplored(location) &&
unitType.MovementCostForCell(self.World, location) == int.MaxValue)) unitType.MovementCostForCell(self.World, location) == int.MaxValue))
cursor = "move-blocked"; cursor = "move-blocked";

5
OpenRA.Mods.RA/Widgets/WorldTooltipWidget.cs
View File

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