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

Avoid repeated queries of DeveloperMode.

Browse Source
This commit is contained in:
Paul Chote
2014-06-21 22:21:39 +12:00
parent 2af123034d
commit 749a947d3f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.RA/Player/ProductionQueue.cs
View File

@@ -74,6 +74,7 @@ namespace OpenRA.Mods.RA
// Will change if the owner changes // Will change if the owner changes
PowerManager playerPower; PowerManager playerPower;
PlayerResources playerResources; PlayerResources playerResources;
DeveloperMode developerMode;
string race; string race;
// A list of things we could possibly build // A list of things we could possibly build
@@ -97,6 +98,7 @@ namespace OpenRA.Mods.RA
Info = info; Info = info;
playerResources = playerActor.Trait<PlayerResources>(); playerResources = playerActor.Trait<PlayerResources>();
playerPower = playerActor.Trait<PowerManager>(); playerPower = playerActor.Trait<PowerManager>();
developerMode = playerActor.Trait<DeveloperMode>();
race = init.Contains<RaceInit>() ? init.Get<RaceInit, string>() : self.Owner.Country.Race; race = init.Contains<RaceInit>() ? init.Get<RaceInit, string>() : self.Owner.Country.Race;
Enabled = !info.Race.Any() || info.Race.Contains(race); Enabled = !info.Race.Any() || info.Race.Contains(race);
@@ -118,6 +120,7 @@ namespace OpenRA.Mods.RA
{ {
playerPower = newOwner.PlayerActor.Trait<PowerManager>(); playerPower = newOwner.PlayerActor.Trait<PowerManager>();
playerResources = newOwner.PlayerActor.Trait<PlayerResources>(); playerResources = newOwner.PlayerActor.Trait<PlayerResources>();
developerMode = newOwner.PlayerActor.Trait<DeveloperMode>();
ClearQueue(); ClearQueue();
if (!Info.Sticky) if (!Info.Sticky)
@@ -201,7 +204,7 @@ namespace OpenRA.Mods.RA
public virtual IEnumerable<ActorInfo> AllItems() public virtual IEnumerable<ActorInfo> AllItems()
{ {
if (self.World.AllowDevCommands && self.Owner.PlayerActor.Trait<DeveloperMode>().AllTech) if (self.World.AllowDevCommands && developerMode.AllTech)
return produceable.Select(a => a.Key); return produceable.Select(a => a.Key);
return produceable.Where(a => a.Value.Buildable || a.Value.Visible).Select(a => a.Key); return produceable.Where(a => a.Value.Buildable || a.Value.Visible).Select(a => a.Key);
@@ -209,7 +212,7 @@ namespace OpenRA.Mods.RA
public virtual IEnumerable<ActorInfo> BuildableItems() public virtual IEnumerable<ActorInfo> BuildableItems()
{ {
if (self.World.AllowDevCommands && self.Owner.PlayerActor.Trait<DeveloperMode>().AllTech) if (self.World.AllowDevCommands && developerMode.AllTech)
return produceable.Select(a => a.Key); return produceable.Select(a => a.Key);
return produceable.Where(a => a.Value.Buildable).Select(a => a.Key); return produceable.Where(a => a.Value.Buildable).Select(a => a.Key);