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

INotifyCreated.Created now calls base properly

Browse Source
This commit is contained in:
Markus Hartung
2017-06-02 00:29:19 +02:00
committed by reaperrr
parent f7ddb969c6
commit 2a0b3b39ea
5 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Cnc/Traits/SupportPowers/AttackOrderPower.cs
View File

@@ -47,9 +47,11 @@ namespace OpenRA.Mods.Cnc.Traits
attack.AttackTarget(Target.FromCell(self.World, order.TargetLocation), false, false, true); attack.AttackTarget(Target.FromCell(self.World, order.TargetLocation), false, false, true);
} }
void INotifyCreated.Created(Actor self) protected override void Created(Actor self)
{ {
attack = self.Trait<AttackBase>(); attack = self.Trait<AttackBase>();
base.Created(self);
} }
void INotifyBurstComplete.FiredBurst(Actor self, Target target, Armament a) void INotifyBurstComplete.FiredBurst(Actor self, Target target, Armament a)

4
OpenRA.Mods.Common/Traits/CashTrickler.cs
View File

@@ -45,9 +45,11 @@ namespace OpenRA.Mods.Common.Traits
this.info = info; this.info = info;
} }
void INotifyCreated.Created(Actor self) protected override void Created(Actor self)
{ {
resources = self.Owner.PlayerActor.Trait<PlayerResources>(); resources = self.Owner.PlayerActor.Trait<PlayerResources>();
base.Created(self);
} }
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)

4
OpenRA.Mods.Common/Traits/Cloak.cs
View File

@@ -80,7 +80,7 @@ namespace OpenRA.Mods.Common.Traits
remainingTime = info.InitialDelay; remainingTime = info.InitialDelay;
} }
void INotifyCreated.Created(Actor self) protected override void Created(Actor self)
{ {
conditionManager = self.TraitOrDefault<ConditionManager>(); conditionManager = self.TraitOrDefault<ConditionManager>();
@@ -90,6 +90,8 @@ namespace OpenRA.Mods.Common.Traits
if (conditionManager != null && cloakedToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.CloakedCondition)) if (conditionManager != null && cloakedToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.CloakedCondition))
cloakedToken = conditionManager.GrantCondition(self, Info.CloakedCondition); cloakedToken = conditionManager.GrantCondition(self, Info.CloakedCondition);
} }
base.Created(self);
} }
public bool Cloaked { get { return !IsTraitDisabled && remainingTime <= 0; } } public bool Cloaked { get { return !IsTraitDisabled && remainingTime <= 0; } }

4
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -478,9 +478,11 @@ namespace OpenRA.Mods.Common.Traits
SetVisualPosition(self, init.Get<CenterPositionInit, WPos>()); SetVisualPosition(self, init.Get<CenterPositionInit, WPos>());
} }
void INotifyCreated.Created(Actor self) protected override void Created(Actor self)
{ {
conditionManager = self.TraitOrDefault<ConditionManager>(); conditionManager = self.TraitOrDefault<ConditionManager>();
base.Created(self);
} }
// Returns a valid sub-cell // Returns a valid sub-cell

4
OpenRA.Mods.Common/Traits/Power/AffectedByPowerOutage.cs
View File

@@ -40,9 +40,11 @@ namespace OpenRA.Mods.Common.Traits
protected override void TraitEnabled(Actor self) { UpdateStatus(self); } protected override void TraitEnabled(Actor self) { UpdateStatus(self); }
protected override void TraitDisabled(Actor self) { Revoke(self); } protected override void TraitDisabled(Actor self) { Revoke(self); }
void INotifyCreated.Created(Actor self) protected override void Created(Actor self)
{ {
conditionManager = self.TraitOrDefault<ConditionManager>(); conditionManager = self.TraitOrDefault<ConditionManager>();
base.Created(self);
} }
float ISelectionBar.GetValue() float ISelectionBar.GetValue()