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

GpsWatcher.Owner is not used anywhere else

Browse Source
This commit is contained in:
Matthias Mailänder
2016-01-24 17:48:00 +01:00
parent 91041fbea3
commit a11a183cad
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Mods.RA/Traits/GpsWatcher.cs
View File

@@ -30,12 +30,16 @@ namespace OpenRA.Mods.RA.Traits
[Sync] public bool Launched { get; private set; } [Sync] public bool Launched { get; private set; }
[Sync] public bool GrantedAllies { get; private set; } [Sync] public bool GrantedAllies { get; private set; }
[Sync] public bool Granted { get; private set; } [Sync] public bool Granted { get; private set; }
public readonly Player Owner;
readonly Player owner;
readonly List<Actor> actors = new List<Actor>(); readonly List<Actor> actors = new List<Actor>();
readonly HashSet<TraitPair<IOnGpsRefreshed>> notifyOnRefresh = new HashSet<TraitPair<IOnGpsRefreshed>>(); readonly HashSet<TraitPair<IOnGpsRefreshed>> notifyOnRefresh = new HashSet<TraitPair<IOnGpsRefreshed>>();
public GpsWatcher(Player owner) { Owner = owner; } public GpsWatcher(Player owner)
{
this.owner = owner;
}
public void GpsRemove(Actor atek) public void GpsRemove(Actor atek)
{ {
@@ -66,7 +70,7 @@ namespace OpenRA.Mods.RA.Traits
foreach (var i in atek.World.ActorsWithTrait<GpsWatcher>()) foreach (var i in atek.World.ActorsWithTrait<GpsWatcher>())
i.Trait.RefreshGranted(); i.Trait.RefreshGranted();
if ((Granted || GrantedAllies) && atek.Owner.IsAlliedWith(Owner)) if ((Granted || GrantedAllies) && atek.Owner.IsAlliedWith(owner))
atek.Owner.Shroud.ExploreAll(atek.World); atek.Owner.Shroud.ExploreAll(atek.World);
} }
@@ -76,14 +80,14 @@ namespace OpenRA.Mods.RA.Traits
var wasGrantedAllies = GrantedAllies; var wasGrantedAllies = GrantedAllies;
Granted = actors.Count > 0 && Launched; Granted = actors.Count > 0 && Launched;
GrantedAllies = Owner.World.ActorsHavingTrait<GpsWatcher>(g => g.Granted).Any(p => p.Owner.IsAlliedWith(Owner)); GrantedAllies = owner.World.ActorsHavingTrait<GpsWatcher>(g => g.Granted).Any(p => p.Owner.IsAlliedWith(owner));
if (Granted || GrantedAllies) if (Granted || GrantedAllies)
Owner.Shroud.ExploreAll(Owner.World); owner.Shroud.ExploreAll(owner.World);
if (wasGranted != Granted || wasGrantedAllies != GrantedAllies) if (wasGranted != Granted || wasGrantedAllies != GrantedAllies)
foreach (var tp in notifyOnRefresh.ToList()) foreach (var tp in notifyOnRefresh.ToList())
tp.Trait.OnGpsRefresh(tp.Actor, Owner); tp.Trait.OnGpsRefresh(tp.Actor, owner);
} }
public bool HasFogVisibility() public bool HasFogVisibility()
@@ -97,7 +101,7 @@ namespace OpenRA.Mods.RA.Traits
if (gpsDot == null) if (gpsDot == null)
return false; return false;
return gpsDot.IsDotVisible(Owner); return gpsDot.IsDotVisible(owner);
} }
public void RegisterForOnGpsRefreshed(Actor actor, IOnGpsRefreshed toBeNotified) public void RegisterForOnGpsRefreshed(Actor actor, IOnGpsRefreshed toBeNotified)

2
OpenRA.Mods.RA/Traits/SupportPowers/GpsPower.cs
View File

@@ -35,8 +35,8 @@ namespace OpenRA.Mods.RA.Traits
class GpsPower : SupportPower, INotifyKilled, INotifyStanceChanged, INotifySold, INotifyOwnerChanged class GpsPower : SupportPower, INotifyKilled, INotifyStanceChanged, INotifySold, INotifyOwnerChanged
{ {
GpsWatcher owner;
readonly GpsPowerInfo info; readonly GpsPowerInfo info;
GpsWatcher owner;
public GpsPower(Actor self, GpsPowerInfo info) public GpsPower(Actor self, GpsPowerInfo info)
: base(self, info) : base(self, info)