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

Merge ConditionManager trait directly into Actor

Browse Source
This commit is contained in:
atlimit8
2020-04-18 23:25:05 -05:00
committed by reaperrr
parent e12c1dc9aa
commit 259c8d2c98
65 changed files with 466 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Mods.Common/Traits/Conditions/GrantCondition.cs
View File

@@ -29,31 +29,23 @@ namespace OpenRA.Mods.Common.Traits
class GrantCondition : ConditionalTrait<GrantConditionInfo>
{
ConditionManager conditionManager;
int conditionToken = ConditionManager.InvalidConditionToken;
int conditionToken = Actor.InvalidConditionToken;
public GrantCondition(GrantConditionInfo info)
: base(info) { }
protected override void Created(Actor self)
{
conditionManager = self.Trait<ConditionManager>();
base.Created(self);
}
protected override void TraitEnabled(Actor self)
{
if (conditionToken == ConditionManager.InvalidConditionToken)
conditionToken = conditionManager.GrantCondition(self, Info.Condition);
if (conditionToken == Actor.InvalidConditionToken)
conditionToken = self.GrantCondition(Info.Condition);
}
protected override void TraitDisabled(Actor self)
{
if (Info.GrantPermanently || conditionToken == ConditionManager.InvalidConditionToken)
if (Info.GrantPermanently || conditionToken == Actor.InvalidConditionToken)
return;
conditionToken = conditionManager.RevokeCondition(self, conditionToken);
conditionToken = self.RevokeCondition(conditionToken);
}
}
}