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

Fix Move activity ignoring IDisableMove.

Browse Source
This commit is contained in:
Paul Chote
2014-10-04 13:38:35 +13:00
parent 34eb634779
commit 6b54575569
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.RA/Move/Move.cs
View File

@@ -23,6 +23,7 @@ namespace OpenRA.Mods.RA.Move
static readonly List<CPos> NoPath = new List<CPos>(); static readonly List<CPos> NoPath = new List<CPos>();
readonly Mobile mobile; readonly Mobile mobile;
readonly IEnumerable<IDisableMove> moveDisablers;
readonly WRange nearEnough; readonly WRange nearEnough;
readonly Func<List<CPos>> getPath; readonly Func<List<CPos>> getPath;
readonly Actor ignoreBuilding; readonly Actor ignoreBuilding;
@@ -40,6 +41,7 @@ namespace OpenRA.Mods.RA.Move
public Move(Actor self, CPos destination) public Move(Actor self, CPos destination)
{ {
mobile = self.Trait<Mobile>(); mobile = self.Trait<Mobile>();
moveDisablers = self.TraitsImplementing<IDisableMove>();
getPath = () => getPath = () =>
self.World.WorldActor.Trait<PathFinder>().FindPath( self.World.WorldActor.Trait<PathFinder>().FindPath(
@@ -56,6 +58,7 @@ namespace OpenRA.Mods.RA.Move
public Move(Actor self, CPos destination, WRange nearEnough) public Move(Actor self, CPos destination, WRange nearEnough)
{ {
mobile = self.Trait<Mobile>(); mobile = self.Trait<Mobile>();
moveDisablers = self.TraitsImplementing<IDisableMove>();
getPath = () => self.World.WorldActor.Trait<PathFinder>() getPath = () => self.World.WorldActor.Trait<PathFinder>()
.FindUnitPath(mobile.toCell, destination, self); .FindUnitPath(mobile.toCell, destination, self);
@@ -66,6 +69,7 @@ namespace OpenRA.Mods.RA.Move
public Move(Actor self, CPos destination, SubCell subCell, WRange nearEnough) public Move(Actor self, CPos destination, SubCell subCell, WRange nearEnough)
{ {
mobile = self.Trait<Mobile>(); mobile = self.Trait<Mobile>();
moveDisablers = self.TraitsImplementing<IDisableMove>();
getPath = () => self.World.WorldActor.Trait<PathFinder>() getPath = () => self.World.WorldActor.Trait<PathFinder>()
.FindUnitPathToRange(mobile.fromCell, subCell, self.World.Map.CenterOfSubCell(destination, subCell), nearEnough, self); .FindUnitPathToRange(mobile.fromCell, subCell, self.World.Map.CenterOfSubCell(destination, subCell), nearEnough, self);
@@ -76,6 +80,7 @@ namespace OpenRA.Mods.RA.Move
public Move(Actor self, CPos destination, Actor ignoreBuilding) public Move(Actor self, CPos destination, Actor ignoreBuilding)
{ {
mobile = self.Trait<Mobile>(); mobile = self.Trait<Mobile>();
moveDisablers = self.TraitsImplementing<IDisableMove>();
getPath = () => getPath = () =>
self.World.WorldActor.Trait<PathFinder>().FindPath( self.World.WorldActor.Trait<PathFinder>().FindPath(
@@ -90,6 +95,7 @@ namespace OpenRA.Mods.RA.Move
public Move(Actor self, Target target, WRange range) public Move(Actor self, Target target, WRange range)
{ {
mobile = self.Trait<Mobile>(); mobile = self.Trait<Mobile>();
moveDisablers = self.TraitsImplementing<IDisableMove>();
getPath = () => getPath = () =>
{ {
@@ -107,6 +113,7 @@ namespace OpenRA.Mods.RA.Move
public Move(Actor self, Func<List<CPos>> getPath) public Move(Actor self, Func<List<CPos>> getPath)
{ {
mobile = self.Trait<Mobile>(); mobile = self.Trait<Mobile>();
moveDisablers = self.TraitsImplementing<IDisableMove>();
this.getPath = getPath; this.getPath = getPath;
@@ -133,6 +140,8 @@ namespace OpenRA.Mods.RA.Move
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
{ {
if (moveDisablers.Any(d => d.MoveDisabled(self)))
return this;
if (destination == mobile.toCell) if (destination == mobile.toCell)
return NextActivity; return NextActivity;