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

harvester empties; first stage of fixing BIM behavior

Browse Source
This commit is contained in:
Chris Forbes
2009-11-04 21:03:56 +13:00
parent 0d2b7eb855
commit 43170cc318
5 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRa.Game/PathFinder.cs
View File

@@ -52,7 +52,7 @@ namespace OpenRa.Game
for( int i = 0 ; i < path.Count ; i++ )
{
var sl = path[ i ];
if( i == 0 || Game.BuildingInfluence.GetBuildingAt( path[ i ] ) == null & Game.UnitInfluence.GetUnitAt( path[ i ] ) == null )
if( i == 0 || (Game.BuildingInfluence.CanMoveHere(path[i]) && Game.UnitInfluence.GetUnitAt( path[ i ] ) == null) )
{
queue.Add( new PathDistance( estimator( sl ), sl ) );
cellInfo[ sl.X, sl.Y ] = new CellInfo( cost, prev, false );
@@ -105,7 +105,7 @@ namespace OpenRa.Game
continue;
if( passableCost[(int)umt][ newHere.X, newHere.Y ] == double.PositiveInfinity )
continue;
if (Game.BuildingInfluence.GetBuildingAt(newHere) != null)
if (!Game.BuildingInfluence.CanMoveHere(newHere))
continue;
if( checkForBlock && Game.UnitInfluence.GetUnitAt( newHere ) != null )
continue;