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

Remove workarounds for querying the PlayerActor in Created

Browse Source
This commit is contained in:
abcdefg30
2020-05-24 19:51:58 +02:00
committed by reaperrr
parent 52a9fcef3c
commit 27d0465891
12 changed files with 20 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/BotModules/BaseBuilderBotModule.cs
View File

@@ -160,13 +160,9 @@ namespace OpenRA.Mods.Common.Traits
protected override void Created(Actor self)
{
// Special case handling is required for the Player actor.
// Created is called before Player.PlayerActor is assigned,
// so we must query player traits from self, which refers
// for bot modules always to the Player actor.
playerPower = self.TraitOrDefault<PowerManager>();
playerResources = self.Trait<PlayerResources>();
positionsUpdatedModules = self.TraitsImplementing<IBotPositionsUpdated>().ToArray();
playerPower = self.Owner.PlayerActor.TraitOrDefault<PowerManager>();
playerResources = self.Owner.PlayerActor.Trait<PlayerResources>();
positionsUpdatedModules = self.Owner.PlayerActor.TraitsImplementing<IBotPositionsUpdated>().ToArray();
}
protected override void TraitEnabled(Actor self)

6
OpenRA.Mods.Common/Traits/BotModules/HarvesterBotModule.cs
View File

@@ -78,11 +78,7 @@ namespace OpenRA.Mods.Common.Traits
protected override void Created(Actor self)
{
// Special case handling is required for the Player actor.
// Created is called before Player.PlayerActor is assigned,
// so we must query player traits from self, which refers
// for bot modules always to the Player actor.
requestUnitProduction = self.TraitsImplementing<IBotRequestUnitProduction>().ToArray();
requestUnitProduction = self.Owner.PlayerActor.TraitsImplementing<IBotRequestUnitProduction>().ToArray();
}
protected override void TraitEnabled(Actor self)

8
OpenRA.Mods.Common/Traits/BotModules/McvManagerBotModule.cs
View File

@@ -82,12 +82,8 @@ namespace OpenRA.Mods.Common.Traits
protected override void Created(Actor self)
{
// Special case handling is required for the Player actor.
// Created is called before Player.PlayerActor is assigned,
// so we must query player traits from self, which refers
// for bot modules always to the Player actor.
notifyPositionsUpdated = self.TraitsImplementing<IBotPositionsUpdated>().ToArray();
requestUnitProduction = self.TraitsImplementing<IBotRequestUnitProduction>().ToArray();
notifyPositionsUpdated = self.Owner.PlayerActor.TraitsImplementing<IBotPositionsUpdated>().ToArray();
requestUnitProduction = self.Owner.PlayerActor.TraitsImplementing<IBotRequestUnitProduction>().ToArray();
}
protected override void TraitEnabled(Actor self)

8
OpenRA.Mods.Common/Traits/BotModules/SquadManagerBotModule.cs
View File

@@ -150,12 +150,8 @@ namespace OpenRA.Mods.Common.Traits
protected override void Created(Actor self)
{
// Special case handling is required for the Player actor.
// Created is called before Player.PlayerActor is assigned,
// so we must query player traits from self, which refers
// for bot modules always to the Player actor.
notifyPositionsUpdated = self.TraitsImplementing<IBotPositionsUpdated>().ToArray();
notifyIdleBaseUnits = self.TraitsImplementing<IBotNotifyIdleBaseUnits>().ToArray();
notifyPositionsUpdated = self.Owner.PlayerActor.TraitsImplementing<IBotPositionsUpdated>().ToArray();
notifyIdleBaseUnits = self.Owner.PlayerActor.TraitsImplementing<IBotNotifyIdleBaseUnits>().ToArray();
}
protected override void TraitEnabled(Actor self)

6
OpenRA.Mods.Common/Traits/BotModules/SupportPowerBotModule.cs
View File

@@ -54,11 +54,7 @@ namespace OpenRA.Mods.Common.Traits
protected override void Created(Actor self)
{
// Special case handling is required for the Player actor.
// Created is called before Player.PlayerActor is assigned,
// so we must query player traits from self, which refers
// for bot modules always to the Player actor.
supportPowerManager = self.Trait<SupportPowerManager>();
supportPowerManager = self.Owner.PlayerActor.Trait<SupportPowerManager>();
}
protected override void TraitEnabled(Actor self)

6
OpenRA.Mods.Common/Traits/BotModules/UnitBuilderBotModule.cs
View File

@@ -62,11 +62,7 @@ namespace OpenRA.Mods.Common.Traits
protected override void Created(Actor self)
{
// Special case handling is required for the Player actor.
// Created is called before Player.PlayerActor is assigned,
// so we must query player traits from self, which refers
// for bot modules always to the Player actor.
requestPause = self.TraitsImplementing<IBotRequestPauseUnitProduction>().ToArray();
requestPause = self.Owner.PlayerActor.TraitsImplementing<IBotRequestPauseUnitProduction>().ToArray();
}
void IBotNotifyIdleBaseUnits.UpdatedIdleBaseUnits(List<Actor> idleUnits)