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

unit/unit blocking works sensibly for first-half; a few glitches due to second-half

Browse Source
This commit is contained in:
Chris Forbes
2009-10-26 13:04:16 +13:00
parent aa04c869a0
commit 2058134380
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRa.Game/PathFinder.cs
View File

@@ -72,8 +72,8 @@ namespace OpenRa.Game
continue; continue;
if (Game.BuildingInfluence.GetBuildingAt(newHere - offset) != null) if (Game.BuildingInfluence.GetBuildingAt(newHere - offset) != null)
continue; continue;
if (Game.UnitInfluence.GetUnitAt(newHere - offset) != null) //if (Game.UnitInfluence.GetUnitAt(newHere - offset) != null)
continue; // continue;
double cellCost = ( ( d.X * d.Y != 0 ) ? 1.414213563 : 1.0 ) * passableCost[(int)umt][ newHere.X, newHere.Y ]; double cellCost = ( ( d.X * d.Y != 0 ) ? 1.414213563 : 1.0 ) * passableCost[(int)umt][ newHere.X, newHere.Y ];
double newCost = cellInfo[ here.X, here.Y ].MinCost + cellCost; double newCost = cellInfo[ here.X, here.Y ].MinCost + cellCost;

9
OpenRa.Game/Traits/Mobile.cs
View File

@@ -160,7 +160,10 @@ namespace OpenRa.Game.Traits
if( firstFacing != mobile.facing ) if( firstFacing != mobile.facing )
mobile.currentAction = new Turn( firstFacing ) { NextAction = this }; mobile.currentAction = new Turn( firstFacing ) { NextAction = this };
else else
{ {
var unitAtDest = Game.UnitInfluence.GetUnitAt(nextCell);
if ( unitAtDest != null && unitAtDest != self )
return; /* todo: repath, sometimes */
mobile.toCell = nextCell; mobile.toCell = nextCell;
path.RemoveAt( path.Count - 1 ); path.RemoveAt( path.Count - 1 );
moveFractionTotal = ( dir.X != 0 && dir.Y != 0 ) ? 35 : 25; moveFractionTotal = ( dir.X != 0 && dir.Y != 0 ) ? 35 : 25;
@@ -169,7 +172,9 @@ namespace OpenRa.Game.Traits
CalculateMoveFraction(); CalculateMoveFraction();
fromFacing = mobile.facing; fromFacing = mobile.facing;
toFacing = mobile.facing; toFacing = mobile.facing;
OnComplete = OnCompleteFirstHalf; OnComplete = OnCompleteFirstHalf;
Game.UnitInfluence.Update(mobile);
} }
mobile.currentAction.Tick( self, mobile ); mobile.currentAction.Tick( self, mobile );
} }