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

Reduce trait lookups further by adding a BuildableInfo parameter to GetBuildTime

Browse Source
This commit is contained in:
abcdefg30
2016-01-21 22:29:01 +01:00
parent 4e0775b59e
commit ed3f3706f9
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,7 @@ namespace OpenRA.Mods.Common.Traits
return GetBuildTime(self.World.Map.Rules.Actors[unitString]); return GetBuildTime(self.World.Map.Rules.Actors[unitString]);
} }
public override int GetBuildTime(ActorInfo unit) public override int GetBuildTime(ActorInfo unit, BuildableInfo bi = null)
{ {
if (self.World.AllowDevCommands && self.Owner.PlayerActor.Trait<DeveloperMode>().FastBuild) if (self.World.AllowDevCommands && self.Owner.PlayerActor.Trait<DeveloperMode>().FastBuild)
return 0; return 0;
@@ -131,7 +131,7 @@ namespace OpenRA.Mods.Common.Traits
if (info.SpeedUp) if (info.SpeedUp)
{ {
var type = unit.TraitInfo<BuildableInfo>().BuildAtProductionType ?? info.Type; var type = (bi ?? unit.TraitInfo<BuildableInfo>()).BuildAtProductionType ?? info.Type;
var selfsameProductionsCount = self.World.ActorsWithTrait<Production>() var selfsameProductionsCount = self.World.ActorsWithTrait<Production>()
.Count(p => p.Actor.Owner == self.Owner && p.Trait.Info.Produces.Contains(type)); .Count(p => p.Actor.Owner == self.Owner && p.Trait.Info.Produces.Contains(type));

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

@@ -275,7 +275,7 @@ namespace OpenRA.Mods.Common.Traits
var valued = unit.TraitInfoOrDefault<ValuedInfo>(); var valued = unit.TraitInfoOrDefault<ValuedInfo>();
var cost = valued != null ? valued.Cost : 0; var cost = valued != null ? valued.Cost : 0;
var time = GetBuildTime(unit); var time = GetBuildTime(unit, bi);
var amountToBuild = Math.Min(fromLimit, order.ExtraData); var amountToBuild = Math.Min(fromLimit, order.ExtraData);
for (var n = 0; n < amountToBuild; n++) for (var n = 0; n < amountToBuild; n++)
{ {
@@ -313,7 +313,7 @@ namespace OpenRA.Mods.Common.Traits
return GetBuildTime(self.World.Map.Rules.Actors[unitString]); return GetBuildTime(self.World.Map.Rules.Actors[unitString]);
} }
public virtual int GetBuildTime(ActorInfo unit) public virtual int GetBuildTime(ActorInfo unit, BuildableInfo bi = null)
{ {
if (self.World.AllowDevCommands && self.Owner.PlayerActor.Trait<DeveloperMode>().FastBuild) if (self.World.AllowDevCommands && self.Owner.PlayerActor.Trait<DeveloperMode>().FastBuild)
return 0; return 0;

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/ProductionTooltipLogic.cs
View File

@@ -81,7 +81,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
powerIcon.IsVisible = () => power != 0; powerIcon.IsVisible = () => power != 0;
var lowpower = pm.PowerState != PowerState.Normal; var lowpower = pm.PowerState != PowerState.Normal;
var time = palette.CurrentQueue == null ? 0 : palette.CurrentQueue.GetBuildTime(actor) var time = palette.CurrentQueue == null ? 0 : palette.CurrentQueue.GetBuildTime(actor, buildable)
* (lowpower ? palette.CurrentQueue.Info.LowPowerSlowdown : 1); * (lowpower ? palette.CurrentQueue.Info.LowPowerSlowdown : 1);
var timeString = WidgetUtils.FormatTime(time, world.Timestep); var timeString = WidgetUtils.FormatTime(time, world.Timestep);
timeLabel.GetText = () => timeString; timeLabel.GetText = () => timeString;