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

a bit more

Browse Source
This commit is contained in:
Chris Forbes
2010-07-26 21:30:23 +12:00
parent 69a74425d9
commit 3526c05dc8
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Game/Traits/Mobile.cs
View File

@@ -174,6 +174,7 @@ namespace OpenRA.Traits
if (MovementCostForCell(self, cell) == float.PositiveInfinity) if (MovementCostForCell(self, cell) == float.PositiveInfinity)
return false; return false;
// Check for buildings // Check for buildings
var building = bim.GetBuildingBlocking(cell); var building = bim.GetBuildingBlocking(cell);
if (building != null && building != ignoreActor) if (building != null && building != ignoreActor)
@@ -211,7 +212,7 @@ namespace OpenRA.Traits
if (Info.Crushes == null && nonshareable.Count() > 0) if (Info.Crushes == null && nonshareable.Count() > 0)
return false; return false;
if (nonshareable.Any(a => !(a.traits.Contains<ICrushable>() && if (nonshareable.Length > 0 && nonshareable.Any(a => !(a.traits.Contains<ICrushable>() &&
a.traits.WithInterface<ICrushable>().Any(b => b.CrushClasses.Intersect(Info.Crushes).Any())))) a.traits.WithInterface<ICrushable>().Any(b => b.CrushClasses.Intersect(Info.Crushes).Any()))))
return false; return false;
} }
@@ -219,8 +220,6 @@ namespace OpenRA.Traits
return true; return true;
} }
static readonly Actor[] Nothing = { };
public virtual void FinishedMoving(Actor self) public virtual void FinishedMoving(Actor self)
{ {