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

Merge pull request #8664 from Mailaender/unduplicate-mobile

Browse Source 
Removed code duplication from Mobile.cs
This commit is contained in:
Oliver Brakmann
2015-07-13 22:17:37 +02:00
parent 9722502a4b 3f38d063a9
commit 9415ced6ff
1 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,34 +221,7 @@ namespace OpenRA.Mods.Common.Traits
if ((movementCost = MovementCostForCell(world, cell)) == int.MaxValue) if ((movementCost = MovementCostForCell(world, cell)) == int.MaxValue)
return false; return false;
if (SharesCell && world.ActorMap.HasFreeSubCell(cell)) return CanMoveFreelyInto(world, self, cell, ignoreActor, check);
return true;
if (check.HasFlag(CellConditions.TransientActors))
{
var canIgnoreMovingAllies = self != null && !check.HasFlag(CellConditions.BlockedByMovers);
var needsCellExclusively = self == null || Crushes == null || !Crushes.Any();
foreach (var a in world.ActorMap.GetUnitsAt(cell))
{
if (a == ignoreActor)
continue;
// Neutral/enemy units are blockers. Allied units that are moving are not blockers.
if (canIgnoreMovingAllies && self.Owner.Stances[a.Owner] == Stance.Ally && IsMovingInMyDirection(self, a)) continue;
// Non-sharable unit can enter a cell with shareable units only if it can crush all of them.
if (needsCellExclusively)
return false;
var crushables = a.TraitsImplementing<ICrushable>();
if (!crushables.Any())
return false;
foreach (var crushable in crushables)
if (!crushable.CrushableBy(Crushes, self.Owner))
return false;
}
}
return true;
} }
public SubCell GetAvailableSubCell( public SubCell GetAvailableSubCell(