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

Make some Aircraft interface implementations explicit with subclassing

Browse Source
This commit is contained in:
reaperrr
2017-07-14 05:11:24 +02:00
committed by Paul Chote
parent 6c3ff0dc02
commit 95d3d61ffa
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -201,14 +201,24 @@ namespace OpenRA.Mods.Common.Traits
landNow = Info.LandOnCondition.Evaluate(variables);
}
public void Created(Actor self)
void INotifyCreated.Created(Actor self)
{
Created(self);
}
protected virtual void Created(Actor self)
{
conditionManager = self.TraitOrDefault<ConditionManager>();
speedModifiers = self.TraitsImplementing<ISpeedModifier>().ToArray().Select(sm => sm.GetSpeedModifier());
cachedPosition = self.CenterPosition;
}
public void AddedToWorld(Actor self)
void INotifyAddedToWorld.AddedToWorld(Actor self)
{
AddedToWorld(self);
}
protected virtual void AddedToWorld(Actor self)
{
self.World.AddToMaps(self, this);
@@ -219,7 +229,26 @@ namespace OpenRA.Mods.Common.Traits
OnCruisingAltitudeReached();
}
public virtual void Tick(Actor self)
void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
{
RemovedFromWorld(self);
}
protected virtual void RemovedFromWorld(Actor self)
{
UnReserve();
self.World.RemoveFromMaps(self, this);
OnCruisingAltitudeLeft();
OnAirborneAltitudeLeft();
}
void ITick.Tick(Actor self)
{
Tick(self);
}
protected virtual void Tick(Actor self)
{
if (firstTick)
{
@@ -743,15 +772,6 @@ namespace OpenRA.Mods.Common.Traits
#endregion
public void RemovedFromWorld(Actor self)
{
UnReserve();
self.World.RemoveFromMaps(self, this);
OnCruisingAltitudeLeft();
OnAirborneAltitudeLeft();
}
#region Airborne conditions
void OnAirborneAltitudeReached()