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

Remove unnecessary lookups and checks

Browse Source 
- We already return early if the unit doesn't have a BuildableInfo
- World.Map.Rules.Actors[actorName] won't return null
- Made BuildUnit use an ActorInfo instead of the name as parameter
This commit is contained in:
abcdefg30
2016-01-21 16:53:46 +01:00
parent 17daac11a1
commit 5496245a00
2 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,14 +85,13 @@ namespace OpenRA.Mods.Common.Traits
.FirstOrDefault();
}
protected override bool BuildUnit(string name)
protected override bool BuildUnit(ActorInfo unit)
{
// Find a production structure to build this actor
var ai = self.World.Map.Rules.Actors[name];
var bi = ai.TraitInfoOrDefault<BuildableInfo>();
var bi = unit.TraitInfo<BuildableInfo>();
// Some units may request a specific production type, which is ignored if the AllTech cheat is enabled
var type = bi == null || developerMode.AllTech ? Info.Type : bi.BuildAtProductionType ?? Info.Type;
var type = developerMode.AllTech ? Info.Type : bi.BuildAtProductionType ?? Info.Type;
var producers = self.World.ActorsWithTrait<Production>()
.Where(x => x.Actor.Owner == self.Owner
@@ -102,13 +101,13 @@ namespace OpenRA.Mods.Common.Traits
if (!producers.Any())
{
CancelProduction(name, 1);
CancelProduction(unit.Name, 1);
return true;
}
foreach (var p in producers.Where(p => !p.Actor.IsDisabled()))
{
if (p.Trait.Produce(p.Actor, ai, p.Trait.Faction))
if (p.Trait.Produce(p.Actor, unit, p.Trait.Faction))
{
FinishProduction();
return true;
@@ -120,12 +119,7 @@ namespace OpenRA.Mods.Common.Traits
public override int GetBuildTime(string unitString)
{
var ai = self.World.Map.Rules.Actors[unitString];
var bi = ai.TraitInfoOrDefault<BuildableInfo>();
if (bi == null)
return 0;
return GetBuildTime(ai);
return GetBuildTime(self.World.Map.Rules.Actors[unitString]);
}
public override int GetBuildTime(ActorInfo unit)