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

Make interface implementations explicit where possible in traits that implement INotifySold

Browse Source
This commit is contained in:
reaperrr
2016-10-20 18:51:01 +02:00
parent 22dcb1c66f
commit 61284d73dd
16 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Buildings/Refinery.cs
View File

@@ -109,7 +109,7 @@ namespace OpenRA.Mods.Common.Traits
dockedHarv.CancelActivity(); dockedHarv.CancelActivity();
} }
public void Tick(Actor self) void ITick.Tick(Actor self)
{ {
// Harvester was killed while unloading // Harvester was killed while unloading
if (dockedHarv != null && dockedHarv.IsDead) if (dockedHarv != null && dockedHarv.IsDead)
@@ -128,7 +128,7 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
public void Disposing(Actor self) void INotifyActorDisposing.Disposing(Actor self)
{ {
CancelDock(self); CancelDock(self);
foreach (var harv in GetLinkedHarvesters()) foreach (var harv in GetLinkedHarvesters())
@@ -147,7 +147,7 @@ namespace OpenRA.Mods.Common.Traits
harv.QueueActivity(new CallFunc(() => harv.Trait<Harvester>().ContinueHarvesting(harv))); harv.QueueActivity(new CallFunc(() => harv.Trait<Harvester>().ContinueHarvesting(harv)));
} }
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{ {
// Unlink any harvesters // Unlink any harvesters
foreach (var harv in GetLinkedHarvesters()) foreach (var harv in GetLinkedHarvesters())
@@ -156,7 +156,7 @@ namespace OpenRA.Mods.Common.Traits
playerResources = newOwner.PlayerActor.Trait<PlayerResources>(); playerResources = newOwner.PlayerActor.Trait<PlayerResources>();
} }
public void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner) void INotifyCapture.OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner)
{ {
// Steal any docked harv too // Steal any docked harv too
if (dockedHarv != null) if (dockedHarv != null)

6
OpenRA.Mods.Common/Traits/Buildings/Reservable.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.Traits
Actor reservedFor; Actor reservedFor;
Aircraft reservedForAircraft; Aircraft reservedForAircraft;
public void Tick(Actor self) void ITick.Tick(Actor self)
{ {
if (reservedFor == null) if (reservedFor == null)
return; /* nothing to do */ return; /* nothing to do */
@@ -64,13 +64,13 @@ namespace OpenRA.Mods.Common.Traits
return res != null && res.reservedForAircraft != null && !res.reservedForAircraft.MayYieldReservation; return res != null && res.reservedForAircraft != null && !res.reservedForAircraft.MayYieldReservation;
} }
public void Disposing(Actor self) void INotifyActorDisposing.Disposing(Actor self)
{ {
if (reservedForAircraft != null) if (reservedForAircraft != null)
reservedForAircraft.UnReserve(); reservedForAircraft.UnReserve();
} }
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{ {
if (reservedForAircraft != null) if (reservedForAircraft != null)
reservedForAircraft.UnReserve(); reservedForAircraft.UnReserve();

12
OpenRA.Mods.Common/Traits/Cargo.cs
View File

@@ -124,7 +124,7 @@ namespace OpenRA.Mods.Common.Traits
facing = Exts.Lazy(self.TraitOrDefault<IFacing>); facing = Exts.Lazy(self.TraitOrDefault<IFacing>);
} }
public void Created(Actor self) void INotifyCreated.Created(Actor self)
{ {
aircraft = self.TraitOrDefault<Aircraft>(); aircraft = self.TraitOrDefault<Aircraft>();
} }
@@ -320,7 +320,7 @@ namespace OpenRA.Mods.Common.Traits
upgradeManager.GrantUpgrade(self, u, p); upgradeManager.GrantUpgrade(self, u, p);
} }
public void Killed(Actor self, AttackInfo e) void INotifyKilled.Killed(Actor self, AttackInfo e)
{ {
if (Info.EjectOnDeath) if (Info.EjectOnDeath)
while (!IsEmpty(self) && CanUnload()) while (!IsEmpty(self) && CanUnload())
@@ -348,7 +348,7 @@ namespace OpenRA.Mods.Common.Traits
cargo.Clear(); cargo.Clear();
} }
public void Disposing(Actor self) void INotifyActorDisposing.Disposing(Actor self)
{ {
foreach (var c in cargo) foreach (var c in cargo)
c.Dispose(); c.Dispose();
@@ -377,7 +377,7 @@ namespace OpenRA.Mods.Common.Traits
}); });
} }
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{ {
if (cargo == null) if (cargo == null)
return; return;
@@ -389,7 +389,7 @@ namespace OpenRA.Mods.Common.Traits
}); });
} }
public void AddedToWorld(Actor self) void INotifyAddedToWorld.AddedToWorld(Actor self)
{ {
// Force location update to avoid issues when initial spawn is outside map // Force location update to avoid issues when initial spawn is outside map
currentCell = self.Location; currentCell = self.Location;
@@ -397,7 +397,7 @@ namespace OpenRA.Mods.Common.Traits
} }
bool initialized; bool initialized;
public void Tick(Actor self) void ITick.Tick(Actor self)
{ {
// Notify initial cargo load // Notify initial cargo load
if (!initialized) if (!initialized)

10
OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
View File

@@ -118,7 +118,7 @@ namespace OpenRA.Mods.Common.Traits
queue.Clear(); queue.Clear();
} }
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{ {
ClearQueue(); ClearQueue();
@@ -138,13 +138,13 @@ namespace OpenRA.Mods.Common.Traits
newOwner.PlayerActor.Trait<TechTree>().Update(); newOwner.PlayerActor.Trait<TechTree>().Update();
} }
public void Killed(Actor killed, AttackInfo e) { if (killed == self) { ClearQueue(); Enabled = false; } } void INotifyKilled.Killed(Actor killed, AttackInfo e) { if (killed == self) { ClearQueue(); Enabled = false; } }
void INotifySold.Selling(Actor self) { ClearQueue(); Enabled = false; } void INotifySold.Selling(Actor self) { ClearQueue(); Enabled = false; }
void INotifySold.Sold(Actor self) { } void INotifySold.Sold(Actor self) { }
public void BeforeTransform(Actor self) { ClearQueue(); Enabled = false; } void INotifyTransform.BeforeTransform(Actor self) { ClearQueue(); Enabled = false; }
public void OnTransform(Actor self) { } void INotifyTransform.OnTransform(Actor self) { }
public void AfterTransform(Actor self) { } void INotifyTransform.AfterTransform(Actor self) { }
void CacheProducibles(Actor playerActor) void CacheProducibles(Actor playerActor)
{ {

4
OpenRA.Mods.Common/Traits/Render/WithChargeOverlay.cs
View File

@@ -49,13 +49,13 @@ namespace OpenRA.Mods.Common.Traits.Render
info.Palette, info.IsPlayerPalette); info.Palette, info.IsPlayerPalette);
} }
public void Charging(Actor self, Target target) void INotifyCharging.Charging(Actor self, Target target)
{ {
charging = true; charging = true;
overlay.PlayThen(RenderSprites.NormalizeSequence(overlay, self.GetDamageState(), info.Sequence), () => charging = false); overlay.PlayThen(RenderSprites.NormalizeSequence(overlay, self.GetDamageState(), info.Sequence), () => charging = false);
} }
public void DamageStateChanged(Actor self, AttackInfo e) void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{ {
overlay.ReplaceAnim(RenderSprites.NormalizeSequence(overlay, e.DamageState, info.Sequence)); overlay.ReplaceAnim(RenderSprites.NormalizeSequence(overlay, e.DamageState, info.Sequence));
} }

6
OpenRA.Mods.Common/Traits/Render/WithDockedOverlay.cs
View File

@@ -65,7 +65,7 @@ namespace OpenRA.Mods.Common.Traits.Render
anim.Animation.PlayThen(info.Sequence, PlayDockingOverlay); anim.Animation.PlayThen(info.Sequence, PlayDockingOverlay);
} }
public void BuildingComplete(Actor self) void INotifyBuildComplete.BuildingComplete(Actor self)
{ {
self.World.AddFrameEndTask(w => w.Add(new DelayedAction(120, () => self.World.AddFrameEndTask(w => w.Add(new DelayedAction(120, () =>
buildComplete = true))); buildComplete = true)));
@@ -77,7 +77,7 @@ namespace OpenRA.Mods.Common.Traits.Render
buildComplete = false; buildComplete = false;
} }
public void Docked(Actor self, Actor harvester) { docked = true; PlayDockingOverlay(); } void INotifyDocking.Docked(Actor self, Actor harvester) { docked = true; PlayDockingOverlay(); }
public void Undocked(Actor self, Actor harvester) { docked = false; } void INotifyDocking.Undocked(Actor self, Actor harvester) { docked = false; }
} }
} }

4
OpenRA.Mods.Common/Traits/Render/WithIdleAnimation.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Traits.Render
ticks = info.Interval; ticks = info.Interval;
} }
public void Tick(Actor self) void ITick.Tick(Actor self)
{ {
if (!buildComplete || IsTraitDisabled) if (!buildComplete || IsTraitDisabled)
return; return;
@@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.Traits.Render
} }
} }
public void BuildingComplete(Actor self) void INotifyBuildComplete.BuildingComplete(Actor self)
{ {
buildComplete = true; buildComplete = true;
} }

10
OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
View File

@@ -100,7 +100,7 @@ namespace OpenRA.Mods.Common.Traits.Render
rs.Add(anim, info.Palette, info.IsPlayerPalette); rs.Add(anim, info.Palette, info.IsPlayerPalette);
} }
public void BuildingComplete(Actor self) void INotifyBuildComplete.BuildingComplete(Actor self)
{ {
buildComplete = true; buildComplete = true;
} }
@@ -111,15 +111,15 @@ namespace OpenRA.Mods.Common.Traits.Render
buildComplete = false; buildComplete = false;
} }
public void BeforeTransform(Actor self) void INotifyTransform.BeforeTransform(Actor self)
{ {
buildComplete = false; buildComplete = false;
} }
public void OnTransform(Actor self) { } void INotifyTransform.OnTransform(Actor self) { }
public void AfterTransform(Actor self) { } void INotifyTransform.AfterTransform(Actor self) { }
public void DamageStateChanged(Actor self, AttackInfo e) void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{ {
overlay.ReplaceAnim(RenderSprites.NormalizeSequence(overlay, e.DamageState, overlay.CurrentSequence.Name)); overlay.ReplaceAnim(RenderSprites.NormalizeSequence(overlay, e.DamageState, overlay.CurrentSequence.Name));
} }

8
OpenRA.Mods.Common/Traits/Render/WithProductionDoorOverlay.cs
View File

@@ -57,24 +57,24 @@ namespace OpenRA.Mods.Common.Traits.Render
renderSprites.Add(new AnimationWithOffset(door, null, () => !buildComplete, offset)); renderSprites.Add(new AnimationWithOffset(door, null, () => !buildComplete, offset));
} }
public void BuildingComplete(Actor self) void INotifyBuildComplete.BuildingComplete(Actor self)
{ {
buildComplete = true; buildComplete = true;
} }
public void Tick(Actor self) void ITick.Tick(Actor self)
{ {
if (desiredFrame > 0 && !self.World.ActorMap.GetActorsAt(openExit).Any(a => a != self)) if (desiredFrame > 0 && !self.World.ActorMap.GetActorsAt(openExit).Any(a => a != self))
desiredFrame = 0; desiredFrame = 0;
} }
public void DamageStateChanged(Actor self, AttackInfo e) void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{ {
if (door.CurrentSequence != null) if (door.CurrentSequence != null)
door.ReplaceAnim(RenderSprites.NormalizeSequence(door, e.DamageState, door.CurrentSequence.Name)); door.ReplaceAnim(RenderSprites.NormalizeSequence(door, e.DamageState, door.CurrentSequence.Name));
} }
public void UnitProduced(Actor self, Actor other, CPos exit) void INotifyProduction.UnitProduced(Actor self, Actor other, CPos exit)
{ {
openExit = exit; openExit = exit;
desiredFrame = door.CurrentSequence.Length - 1; desiredFrame = door.CurrentSequence.Length - 1;

8
OpenRA.Mods.Common/Traits/Render/WithProductionOverlay.cs
View File

@@ -80,19 +80,19 @@ namespace OpenRA.Mods.Common.Traits.Render
throw new InvalidOperationException("Can't find production queues."); throw new InvalidOperationException("Can't find production queues.");
} }
public void Created(Actor self) void INotifyCreated.Created(Actor self)
{ {
if (buildComplete) if (buildComplete)
SelectQueue(self); SelectQueue(self);
} }
public void BuildingComplete(Actor self) void INotifyBuildComplete.BuildingComplete(Actor self)
{ {
buildComplete = true; buildComplete = true;
SelectQueue(self); SelectQueue(self);
} }
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{ {
self.World.AddFrameEndTask(w => SelectQueue(self)); self.World.AddFrameEndTask(w => SelectQueue(self));
} }
@@ -103,7 +103,7 @@ namespace OpenRA.Mods.Common.Traits.Render
buildComplete = false; buildComplete = false;
} }
public void DamageStateChanged(Actor self, AttackInfo e) void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{ {
overlay.ReplaceAnim(RenderSprites.NormalizeSequence(overlay, e.DamageState, overlay.CurrentSequence.Name)); overlay.ReplaceAnim(RenderSprites.NormalizeSequence(overlay, e.DamageState, overlay.CurrentSequence.Name));
} }

2
OpenRA.Mods.Common/Traits/Render/WithRearmAnimation.cs
View File

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits.Render
spriteBody.PlayCustomAnimation(self, info.Sequence, () => spriteBody.CancelCustomAnimation(self)); spriteBody.PlayCustomAnimation(self, info.Sequence, () => spriteBody.CancelCustomAnimation(self));
} }
public void BuildingComplete(Actor self) void INotifyBuildComplete.BuildingComplete(Actor self)
{ {
buildComplete = true; buildComplete = true;
} }

4
OpenRA.Mods.Common/Traits/Render/WithRepairAnimation.cs
View File

@@ -36,13 +36,13 @@ namespace OpenRA.Mods.Common.Traits.Render
spriteBody = self.TraitOrDefault<WithSpriteBody>(); spriteBody = self.TraitOrDefault<WithSpriteBody>();
} }
public void Repairing(Actor self, Actor target) void INotifyRepair.Repairing(Actor self, Actor target)
{ {
if (buildComplete && spriteBody != null && !(info.PauseOnLowPower && self.IsDisabled())) if (buildComplete && spriteBody != null && !(info.PauseOnLowPower && self.IsDisabled()))
spriteBody.PlayCustomAnimation(self, info.Sequence, () => spriteBody.CancelCustomAnimation(self)); spriteBody.PlayCustomAnimation(self, info.Sequence, () => spriteBody.CancelCustomAnimation(self));
} }
public void BuildingComplete(Actor self) void INotifyBuildComplete.BuildingComplete(Actor self)
{ {
buildComplete = true; buildComplete = true;
} }

6
OpenRA.Mods.Common/Traits/Render/WithRepairOverlay.cs
View File

@@ -59,7 +59,7 @@ namespace OpenRA.Mods.Common.Traits.Render
rs.Add(anim, info.Palette, info.IsPlayerPalette); rs.Add(anim, info.Palette, info.IsPlayerPalette);
} }
public void BuildingComplete(Actor self) void INotifyBuildComplete.BuildingComplete(Actor self)
{ {
self.World.AddFrameEndTask(w => w.Add(new DelayedAction(120, () => self.World.AddFrameEndTask(w => w.Add(new DelayedAction(120, () =>
buildComplete = true))); buildComplete = true)));
@@ -71,12 +71,12 @@ namespace OpenRA.Mods.Common.Traits.Render
buildComplete = false; buildComplete = false;
} }
public void DamageStateChanged(Actor self, AttackInfo e) void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{ {
overlay.ReplaceAnim(RenderSprites.NormalizeSequence(overlay, e.DamageState, overlay.CurrentSequence.Name)); overlay.ReplaceAnim(RenderSprites.NormalizeSequence(overlay, e.DamageState, overlay.CurrentSequence.Name));
} }
public void Repairing(Actor self, Actor host) void INotifyRepair.Repairing(Actor self, Actor host)
{ {
visible = true; visible = true;
overlay.PlayThen(overlay.CurrentSequence.Name, () => visible = false); overlay.PlayThen(overlay.CurrentSequence.Name, () => visible = false);

6
OpenRA.Mods.Common/Traits/Render/WithResources.cs
View File

@@ -50,18 +50,18 @@ namespace OpenRA.Mods.Common.Traits.Render
rs.Add(anim); rs.Add(anim);
} }
public void BuildingComplete(Actor self) void INotifyBuildComplete.BuildingComplete(Actor self)
{ {
buildComplete = true; buildComplete = true;
} }
public void DamageStateChanged(Actor self, AttackInfo e) void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{ {
if (anim.Animation.CurrentSequence != null) if (anim.Animation.CurrentSequence != null)
anim.Animation.ReplaceAnim(wsb.NormalizeSequence(self, info.Sequence)); anim.Animation.ReplaceAnim(wsb.NormalizeSequence(self, info.Sequence));
} }
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{ {
playerResources = newOwner.PlayerActor.Trait<PlayerResources>(); playerResources = newOwner.PlayerActor.Trait<PlayerResources>();
} }

6
OpenRA.Mods.D2k/Traits/Render/WithDeliveryOverlay.cs
View File

@@ -69,7 +69,7 @@ namespace OpenRA.Mods.D2k.Traits.Render
anim.Animation.PlayThen(info.Sequence, PlayDeliveryOverlay); anim.Animation.PlayThen(info.Sequence, PlayDeliveryOverlay);
} }
public void BuildingComplete(Actor self) void INotifyBuildComplete.BuildingComplete(Actor self)
{ {
self.World.AddFrameEndTask(w => w.Add(new DelayedAction(120, () => self.World.AddFrameEndTask(w => w.Add(new DelayedAction(120, () =>
buildComplete = true))); buildComplete = true)));
@@ -81,7 +81,7 @@ namespace OpenRA.Mods.D2k.Traits.Render
buildComplete = false; buildComplete = false;
} }
public void IncomingDelivery(Actor self) { delivering = true; PlayDeliveryOverlay(); } void INotifyDelivery.IncomingDelivery(Actor self) { delivering = true; PlayDeliveryOverlay(); }
public void Delivered(Actor self) { delivering = false; } void INotifyDelivery.Delivered(Actor self) { delivering = false; }
} }
} }

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

@@ -84,7 +84,7 @@ namespace OpenRA.Mods.RA.Traits
}); });
} }
public void Killed(Actor self, AttackInfo e) { RemoveGps(self); } void INotifyKilled.Killed(Actor self, AttackInfo e) { RemoveGps(self); }
void INotifySold.Selling(Actor self) { } void INotifySold.Selling(Actor self) { }
void INotifySold.Sold(Actor self) { RemoveGps(self); } void INotifySold.Sold(Actor self) { RemoveGps(self); }
@@ -95,7 +95,7 @@ namespace OpenRA.Mods.RA.Traits
owner.GpsRemove(self); owner.GpsRemove(self);
} }
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{ {
RemoveGps(self); RemoveGps(self);
owner = newOwner.PlayerActor.Trait<GpsWatcher>(); owner = newOwner.PlayerActor.Trait<GpsWatcher>();
@@ -105,7 +105,7 @@ namespace OpenRA.Mods.RA.Traits
bool NoActiveRadar { get { return !self.World.ActorsHavingTrait<ProvidesRadar>(r => r.IsActive).Any(a => a.Owner == self.Owner); } } bool NoActiveRadar { get { return !self.World.ActorsHavingTrait<ProvidesRadar>(r => r.IsActive).Any(a => a.Owner == self.Owner); } }
bool wasDisabled; bool wasDisabled;
public void Tick(Actor self) void ITick.Tick(Actor self)
{ {
if (!wasDisabled && (self.IsDisabled() || (info.RequiresActiveRadar && NoActiveRadar))) if (!wasDisabled && (self.IsDisabled() || (info.RequiresActiveRadar && NoActiveRadar)))
{ {