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

Merge pull request #12981 from abcdefg30/grantOwner

Browse Source 
Fix GrantConditionOnPrerequisite not refreshing when the actor's owner changes.
This commit is contained in:
atlimit8
2017-03-19 17:09:08 -05:00
committed by GitHub
parent d819f3206e e1dda2bf54
commit ff998fd552
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -333,7 +333,6 @@
<Compile Include="Traits\GivesCashOnCapture.cs" /> <Compile Include="Traits\GivesCashOnCapture.cs" />
<Compile Include="Traits\GivesBounty.cs" /> <Compile Include="Traits\GivesBounty.cs" />
<Compile Include="Traits\GivesExperience.cs" /> <Compile Include="Traits\GivesExperience.cs" />
<Compile Include="Traits\GrantConditionOnPrerequisite.cs" />
<Compile Include="Traits\Guard.cs" /> <Compile Include="Traits\Guard.cs" />
<Compile Include="Traits\Guardable.cs" /> <Compile Include="Traits\Guardable.cs" />
<Compile Include="Traits\Harvester.cs" /> <Compile Include="Traits\Harvester.cs" />
@@ -499,6 +498,7 @@
<Compile Include="Traits\Conditions\GrantConditionOnDamageState.cs" /> <Compile Include="Traits\Conditions\GrantConditionOnDamageState.cs" />
<Compile Include="Traits\Conditions\GrantConditionOnTerrain.cs" /> <Compile Include="Traits\Conditions\GrantConditionOnTerrain.cs" />
<Compile Include="Traits\Conditions\GrantConditionOnMovement.cs" /> <Compile Include="Traits\Conditions\GrantConditionOnMovement.cs" />
<Compile Include="Traits\Conditions\GrantConditionOnPrerequisite.cs" />
<Compile Include="Traits\Conditions\ConditionManager.cs" /> <Compile Include="Traits\Conditions\ConditionManager.cs" />
<Compile Include="Traits\Valued.cs" /> <Compile Include="Traits\Valued.cs" />
<Compile Include="Traits\Voiced.cs" /> <Compile Include="Traits\Voiced.cs" />

14
OpenRA.Mods.Common/Traits/GrantConditionOnPrerequisite.cs → OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnPrerequisite.cs
View File

@@ -29,15 +29,14 @@ namespace OpenRA.Mods.Common.Traits
public object Create(ActorInitializer init) { return new GrantConditionOnPrerequisite(init.Self, this); } public object Create(ActorInitializer init) { return new GrantConditionOnPrerequisite(init.Self, this); }
} }
public class GrantConditionOnPrerequisite : INotifyCreated, INotifyAddedToWorld, INotifyRemovedFromWorld public class GrantConditionOnPrerequisite : INotifyCreated, INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyOwnerChanged
{ {
readonly GrantConditionOnPrerequisiteInfo info; readonly GrantConditionOnPrerequisiteInfo info;
readonly GrantConditionOnPrerequisiteManager globalManager;
ConditionManager conditionManager;
int conditionToken = ConditionManager.InvalidConditionToken;
bool wasAvailable; bool wasAvailable;
ConditionManager conditionManager;
GrantConditionOnPrerequisiteManager globalManager;
int conditionToken = ConditionManager.InvalidConditionToken;
public GrantConditionOnPrerequisite(Actor self, GrantConditionOnPrerequisiteInfo info) public GrantConditionOnPrerequisite(Actor self, GrantConditionOnPrerequisiteInfo info)
{ {
@@ -62,6 +61,11 @@ namespace OpenRA.Mods.Common.Traits
globalManager.Unregister(self, this, info.Prerequisites); globalManager.Unregister(self, this, info.Prerequisites);
} }
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
globalManager = newOwner.PlayerActor.Trait<GrantConditionOnPrerequisiteManager>();
}
public void PrerequisitesUpdated(Actor self, bool available) public void PrerequisitesUpdated(Actor self, bool available)
{ {
if (available == wasAvailable || conditionManager == null) if (available == wasAvailable || conditionManager == null)