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

fix entering helicopters

Browse Source
This commit is contained in:
Chris Forbes
2011-05-01 15:16:28 +12:00
parent 5675f02c84
commit 702f787899
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs
View File

@@ -8,9 +8,11 @@
*/ */
#endregion #endregion
using System.Linq;
using OpenRA.Mods.RA.Move; using OpenRA.Mods.RA.Move;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Traits.Activities; using OpenRA.Traits.Activities;
using OpenRA.FileFormats;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.RA.Activities
{ {
@@ -28,13 +30,20 @@ namespace OpenRA.Mods.RA.Activities
if( IsCanceled || target.Destroyed || !target.IsInWorld) return NextActivity; if( IsCanceled || target.Destroyed || !target.IsInWorld) return NextActivity;
var mobile = self.Trait<Mobile>(); var mobile = self.Trait<Mobile>();
var cells = target.Trait<IOccupySpace>().OccupiedCells().ToArray();
if (cells.Length == 0)
cells = new OpenRA.FileFormats.Pair<int2, SubCell>[] {
Pair.New(target.Location, SubCell.FullCell) };
var ps1 = new PathSearch( self.World, mobile.Info ) var ps1 = new PathSearch( self.World, mobile.Info )
{ {
checkForBlocked = true, checkForBlocked = true,
heuristic = location => 0, heuristic = location => 0,
inReverse = true inReverse = true
}; };
foreach( var cell in target.Trait<IOccupySpace>().OccupiedCells() )
foreach( var cell in cells )
{ {
ps1.AddInitialCell( cell.First ); ps1.AddInitialCell( cell.First );
if( ( mobile.toCell - cell.First ).LengthSquared <= 2 ) if( ( mobile.toCell - cell.First ).LengthSquared <= 2 )