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

Allow GrantConditionOnPrerequisite to work on Player:

Browse Source
This commit is contained in:
Mustafa Alperen Seki
2017-12-23 15:25:10 +03:00
committed by abcdefg30
parent 7b6b79493c
commit f7de5d46be
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnPrerequisite.cs
View File

@@ -41,11 +41,17 @@ namespace OpenRA.Mods.Common.Traits
public GrantConditionOnPrerequisite(Actor self, GrantConditionOnPrerequisiteInfo info) public GrantConditionOnPrerequisite(Actor self, GrantConditionOnPrerequisiteInfo info)
{ {
this.info = info; this.info = info;
globalManager = self.Owner.PlayerActor.Trait<GrantConditionOnPrerequisiteManager>();
} }
void INotifyCreated.Created(Actor self) void INotifyCreated.Created(Actor self)
{ {
// Special case handling is required for the Player actor.
// Created is called before Player.PlayerActor is assigned,
// so we must query other player traits from self, knowing that
// it refers to the same actor as self.Owner.PlayerActor
var playerActor = self.Info.Name == "player" ? self : self.Owner.PlayerActor;
globalManager = playerActor.Trait<GrantConditionOnPrerequisiteManager>();
conditionManager = self.TraitOrDefault<ConditionManager>(); conditionManager = self.TraitOrDefault<ConditionManager>();
} }