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

Cache the *Infos in ProductionItem.

Browse Source
This commit is contained in:
Zimmermann Gyula
2016-08-07 11:00:45 +02:00
parent 3309e8ac3d
commit d9f38d57a7
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Player/ClassicProductionQueue.cs
View File

@@ -118,12 +118,6 @@ namespace OpenRA.Mods.Common.Traits
return false; return false;
} }
public override int GetBuildTime(string unitString)
{
var actorInfo = self.World.Map.Rules.Actors[unitString];
return GetBuildTime(actorInfo, actorInfo.TraitInfo<BuildableInfo>());
}
public override int GetBuildTime(ActorInfo unit, BuildableInfo bi) public override int GetBuildTime(ActorInfo unit, BuildableInfo bi)
{ {
if (developerMode.FastBuild) if (developerMode.FastBuild)

12
OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
View File

@@ -309,12 +309,6 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
public virtual int GetBuildTime(string unitString)
{
var actorInfo = self.World.Map.Rules.Actors[unitString];
return GetBuildTime(actorInfo, actorInfo.TraitInfo<BuildableInfo>());
}
public virtual int GetBuildTime(ActorInfo unit, BuildableInfo bi) public virtual int GetBuildTime(ActorInfo unit, BuildableInfo bi)
{ {
if (developerMode.FastBuild) if (developerMode.FastBuild)
@@ -423,6 +417,8 @@ namespace OpenRA.Mods.Common.Traits
public bool Started { get; private set; } public bool Started { get; private set; }
public int Slowdown { get; private set; } public int Slowdown { get; private set; }
readonly ActorInfo ai;
readonly BuildableInfo bi;
readonly PowerManager pm; readonly PowerManager pm;
public ProductionItem(ProductionQueue queue, string item, int cost, PowerManager pm, Action onComplete) public ProductionItem(ProductionQueue queue, string item, int cost, PowerManager pm, Action onComplete)
@@ -433,13 +429,15 @@ namespace OpenRA.Mods.Common.Traits
OnComplete = onComplete; OnComplete = onComplete;
Queue = queue; Queue = queue;
this.pm = pm; this.pm = pm;
ai = Queue.Actor.World.Map.Rules.Actors[Item];
bi = ai.TraitInfo<BuildableInfo>();
} }
public void Tick(PlayerResources pr) public void Tick(PlayerResources pr)
{ {
if (!Started) if (!Started)
{ {
var time = Queue.GetBuildTime(Item); var time = Queue.GetBuildTime(ai, bi);
if (time > 0) if (time > 0)
RemainingTime = TotalTime = time; RemainingTime = TotalTime = time;