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

Track GpsDot state per player

Browse Source 
Should let us fix the issue mentioned in https://github.com/OpenRA/OpenRA/pull/10007#issuecomment-157409237
This commit is contained in:
Pavel Penev
2015-11-17 18:16:06 +02:00
parent c35f9007c3
commit bfa23c18c0
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenRA.Mods.RA/Effects/GpsDot.cs
View File

@@ -10,6 +10,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using OpenRA.Effects; using OpenRA.Effects;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
@@ -36,6 +37,8 @@ namespace OpenRA.Mods.RA.Effects
readonly GpsDotInfo info; readonly GpsDotInfo info;
readonly Animation anim; readonly Animation anim;
readonly Dictionary<Player, bool> showToPlayer = new Dictionary<Player, bool>();
Lazy<HiddenUnderFog> huf; Lazy<HiddenUnderFog> huf;
Lazy<FrozenUnderFog> fuf; Lazy<FrozenUnderFog> fuf;
Lazy<Disguise> disguise; Lazy<Disguise> disguise;
@@ -43,8 +46,6 @@ namespace OpenRA.Mods.RA.Effects
Cache<Player, GpsWatcher> watcher; Cache<Player, GpsWatcher> watcher;
Cache<Player, FrozenActorLayer> frozen; Cache<Player, FrozenActorLayer> frozen;
bool show = false;
public GpsDot(Actor self, GpsDotInfo info) public GpsDot(Actor self, GpsDotInfo info)
{ {
this.self = self; this.self = self;
@@ -61,9 +62,16 @@ namespace OpenRA.Mods.RA.Effects
watcher = new Cache<Player, GpsWatcher>(p => p.PlayerActor.Trait<GpsWatcher>()); watcher = new Cache<Player, GpsWatcher>(p => p.PlayerActor.Trait<GpsWatcher>());
frozen = new Cache<Player, FrozenActorLayer>(p => p.PlayerActor.Trait<FrozenActorLayer>()); frozen = new Cache<Player, FrozenActorLayer>(p => p.PlayerActor.Trait<FrozenActorLayer>());
showToPlayer = self.World.Players.ToDictionary(x => x, x => false);
} }
bool ShouldShowIndicator() public bool IsDotVisible(Player toPlayer)
{
return showToPlayer[toPlayer];
}
bool ShouldShowIndicator(Player toPlayer)
{ {
if (cloak.Value != null && cloak.Value.Cloaked) if (cloak.Value != null && cloak.Value.Cloaked)
return false; return false;
@@ -71,13 +79,13 @@ namespace OpenRA.Mods.RA.Effects
if (disguise.Value != null && disguise.Value.Disguised) if (disguise.Value != null && disguise.Value.Disguised)
return false; return false;
if (huf.Value != null && !huf.Value.IsVisible(self, self.World.RenderPlayer)) if (huf.Value != null && !huf.Value.IsVisible(self, toPlayer))
return true; return true;
if (fuf.Value == null) if (fuf.Value == null)
return false; return false;
var f = frozen[self.World.RenderPlayer].FromID(self.ActorID); var f = frozen[toPlayer].FromID(self.ActorID);
if (f == null) if (f == null)
return false; return false;
@@ -92,17 +100,19 @@ namespace OpenRA.Mods.RA.Effects
if (self.Disposed) if (self.Disposed)
world.AddFrameEndTask(w => w.Remove(this)); world.AddFrameEndTask(w => w.Remove(this));
show = false; if (!self.IsInWorld || self.IsDead)
if (!self.IsInWorld || self.IsDead || self.World.RenderPlayer == null)
return; return;
var gps = watcher[self.World.RenderPlayer]; foreach (var player in self.World.Players)
show = (gps.Granted || gps.GrantedAllies) && ShouldShowIndicator(); {
var gps = watcher[player];
showToPlayer[player] = (gps.Granted || gps.GrantedAllies) && ShouldShowIndicator(player);
}
} }
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
if (!show || self.Disposed) if (self.World.RenderPlayer == null || !showToPlayer[self.World.RenderPlayer] || self.Disposed)
return SpriteRenderable.None; return SpriteRenderable.None;
var palette = wr.Palette(info.IndicatorPalettePrefix + self.Owner.InternalName); var palette = wr.Palette(info.IndicatorPalettePrefix + self.Owner.InternalName);