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

Merge pull request #12305 from reaperrr/gps-remove-delayedaction

Browse Source 
Replace DelayedAction in GpsWatcher with Tick-based solution
This commit is contained in:
Paul Chote
2016-12-18 14:13:48 +00:00
committed by GitHub
parent f46a3e2d16 4e92311a59
commit 5d5e559a8a
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,30 +48,26 @@ namespace OpenRA.Mods.RA.Traits
public void GpsRemove(Actor atek)
{
actors.Remove(atek);
RefreshGps(atek);
RefreshGps(atek.Owner);
}
public void GpsAdd(Actor atek)
{
actors.Add(atek);
RefreshGps(atek);
RefreshGps(atek.Owner);
}
public void Launch(Actor atek, GpsPowerInfo info)
public void ReachedOrbit(Player launcher)
{
atek.World.Add(new DelayedAction(info.RevealDelay * 25,
() =>
{
Launched = true;
RefreshGps(atek);
}));
Launched = true;
RefreshGps(launcher);
}
public void RefreshGps(Actor atek)
public void RefreshGps(Player launcher)
{
RefreshGranted();
foreach (var i in atek.World.ActorsWithTrait<GpsWatcher>())
foreach (var i in launcher.World.ActorsWithTrait<GpsWatcher>())
i.Trait.RefreshGranted();
}

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

@@ -79,8 +79,6 @@ namespace OpenRA.Mods.RA.Traits
Info.LaunchSpeechNotification, self.Owner.Faction.InternalName);
w.Add(new SatelliteLaunch(self, info));
owner.Launch(self, info);
});
}