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

Perform faster checks in AB.CanAttack much earlier

Browse Source 
Move self.IsDisabled right after IsInWorld and IsTraitDisabled checks.
This should skip/avoid a lot of the following checks when actors are disabled by low power, EMP or similar, potentially saving some performance when there are many disabled actors with attack trait.

Move IsValidFor before HasAnyValidWeapons because the latter is more
expensive.
This commit is contained in:
reaperrr
2015-12-06 03:08:31 +01:00
parent acc9b37a01
commit 0e5ea959aa
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -70,7 +70,10 @@ namespace OpenRA.Mods.Common.Traits
protected virtual bool CanAttack(Actor self, Target target)
{
if (!self.IsInWorld || IsTraitDisabled)
if (!self.IsInWorld || IsTraitDisabled || self.IsDisabled())
return false;
if (!target.IsValidFor(self))
return false;
if (!HasAnyValidWeapons(target))
@@ -80,15 +83,9 @@ namespace OpenRA.Mods.Common.Traits
if (building.Value != null && !building.Value.BuildComplete)
return false;
if (!target.IsValidFor(self))
return false;
if (Armaments.All(a => a.IsReloading))
return false;
if (self.IsDisabled())
return false;
if (target.Type == TargetType.Actor && !self.Owner.CanTargetActor(target.Actor))
return false;