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

Only enumerate crushable traits once in MobileInfo.IsBlockedBy.

Browse Source
This commit is contained in:
RoosterDragon
2015-08-20 19:37:35 +01:00
parent dab53f403d
commit be59d045ce
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -242,11 +242,17 @@ namespace OpenRA.Mods.Common.Traits
// If the other actor in our way cannot be crushed, we are blocked. // If the other actor in our way cannot be crushed, we are blocked.
var crushables = otherActor.TraitsImplementing<ICrushable>(); var crushables = otherActor.TraitsImplementing<ICrushable>();
if (!crushables.Any()) var lacksCrushability = true;
return true;
foreach (var crushable in crushables) foreach (var crushable in crushables)
{
lacksCrushability = false;
if (!crushable.CrushableBy(Crushes, self.Owner)) if (!crushable.CrushableBy(Crushes, self.Owner))
return true; return true;
}
// If there are no crushable traits at all, this means the other actor cannot be crushed - we are blocked.
if (lacksCrushability)
return true;
// We are not blocked by the other actor. // We are not blocked by the other actor.
return false; return false;