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

Cache map option ShortGame at game load

Browse Source 
To reduce MapOptions calls.
This commit is contained in:
reaperrr
2018-03-16 21:59:27 +01:00
committed by Paul Chote
parent 0555ce9321
commit f351f0346f
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@ namespace OpenRA.Mods.Common.Traits
{
readonly ConquestVictoryConditionsInfo info;
readonly MissionObjectives mo;
readonly bool shortGame;
Player[] otherPlayers;
int objectiveID = -1;
@@ -40,6 +41,7 @@ namespace OpenRA.Mods.Common.Traits
{
info = cvcInfo;
mo = self.Trait<MissionObjectives>();
shortGame = self.Owner.World.WorldActor.Trait<MapOptions>().ShortGame;
}
void ITick.Tick(Actor self)
@@ -49,7 +51,7 @@ namespace OpenRA.Mods.Common.Traits
if (objectiveID < 0)
objectiveID = mo.Add(self.Owner, info.Objective, ObjectiveType.Primary, true);
if (!self.Owner.NonCombatant && self.Owner.HasNoRequiredUnits())
if (!self.Owner.NonCombatant && self.Owner.HasNoRequiredUnits(shortGame))
mo.MarkFailed(self.Owner, objectiveID);
// Players, NonCombatants, and IsAlliedWith are all fixed once the game starts, so we can cache the result.