Merge pull request #10650 from pchote/remove-fragile-diplomacy

Remove fragile diplomacy.
This commit is contained in:
Oliver Brakmann
2016-02-06 22:55:55 +01:00
24 changed files with 92 additions and 451 deletions

View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA.Traits
public override object Create(ActorInitializer init) { return new GpsPower(init.Self, this); }
}
class GpsPower : SupportPower, INotifyKilled, INotifyStanceChanged, INotifySold, INotifyOwnerChanged
class GpsPower : SupportPower, INotifyKilled, INotifySold, INotifyOwnerChanged
{
readonly GpsPowerInfo info;
GpsWatcher owner;
@@ -76,11 +76,6 @@ namespace OpenRA.Mods.RA.Traits
owner.GpsRemove(self);
}
public void StanceChanged(Actor self, Player a, Player b, Stance oldStance, Stance newStance)
{
owner.RefreshGps(self);
}
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
RemoveGps(self);