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

Use OccupiesSpace to save more trait look-ups

Browse Source 
This time in Locomotor.IsBlockedBy.
This commit is contained in:
reaperrr
2020-05-30 09:56:35 +02:00
committed by Matthias Mailänder
parent 55e85bd9ca
commit f58c3aed32
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/World/Locomotor.cs
View File

@@ -348,7 +348,7 @@ namespace OpenRA.Mods.Common.Traits
if (check <= BlockedByActor.Immovable && cellFlag.HasCellFlag(CellFlag.HasMovableActor) && if (check <= BlockedByActor.Immovable && cellFlag.HasCellFlag(CellFlag.HasMovableActor) &&
actor.Owner.Stances[otherActor.Owner] == Stance.Ally) actor.Owner.Stances[otherActor.Owner] == Stance.Ally)
{ {
var mobile = otherActor.TraitOrDefault<Mobile>(); var mobile = otherActor.OccupiesSpace as Mobile;
if (mobile != null && !mobile.IsTraitDisabled && !mobile.IsTraitPaused && !mobile.IsImmovable) if (mobile != null && !mobile.IsTraitDisabled && !mobile.IsTraitPaused && !mobile.IsImmovable)
return false; return false;
} }
@@ -369,7 +369,7 @@ namespace OpenRA.Mods.Common.Traits
if (cellFlag.HasCellFlag(CellFlag.HasTransitOnlyActor)) if (cellFlag.HasCellFlag(CellFlag.HasTransitOnlyActor))
{ {
// Transit only tiles should not block movement // Transit only tiles should not block movement
var building = otherActor.TraitOrDefault<Building>(); var building = otherActor.OccupiesSpace as Building;
if (building != null && building.TransitOnlyCells().Contains(cell)) if (building != null && building.TransitOnlyCells().Contains(cell))
return false; return false;
} }