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

git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1322 993157c7-ee19-0410-b2c4-bb4e9862e678

Browse Source
This commit is contained in:
(no author)
2007-07-23 05:27:40 +00:00
parent a6502022e9
commit 5eb3d2ea2d
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
OpenRa.Game/Unit.cs
View File

@@ -71,40 +71,40 @@ namespace OpenRa.Game
{ {
nextOrder = delegate( Game game, double t ) nextOrder = delegate( Game game, double t )
{ {
int speed = (int)( t * ( Speed * 100 ) );
if( nextOrder != null ) if( nextOrder != null )
destination = toCell; destination = toCell;
int desiredFacing = GetFacing( toCell - fromCell ); int desiredFacing = GetFacing( toCell - fromCell );
if( facing != desiredFacing ) if( facing != desiredFacing )
Turn( desiredFacing );
else
{ {
moveFraction += speed; Turn( desiredFacing );
if( moveFraction >= moveFractionTotal ) return;
{
moveFraction = 0;
moveFractionTotal = 0;
fromCell = toCell;
if( toCell == destination )
currentOrder = null;
else
{
List<int2> res = game.pathFinder.FindUnitPath( this, PathFinder.DefaultEstimator( destination ) );
if( res.Count != 0 )
{
toCell = res[ res.Count - 1 ];
int2 dir = toCell - fromCell;
moveFractionTotal = ( dir.X != 0 && dir.Y != 0 ) ? 250 : 200;
}
else
destination = toCell;
}
}
} }
moveFraction += (int)( t * ( Speed * 100 ) );
if( moveFraction < moveFractionTotal )
return;
moveFraction = 0;
moveFractionTotal = 0;
fromCell = toCell;
if( toCell == destination )
{
currentOrder = null;
return;
}
List<int2> res = game.pathFinder.FindUnitPath( this, PathFinder.DefaultEstimator( destination ) );
if( res.Count != 0 )
{
toCell = res[ res.Count - 1 ];
int2 dir = toCell - fromCell;
moveFractionTotal = ( dir.X != 0 && dir.Y != 0 ) ? 250 : 200;
}
else
destination = toCell;
}; };
} }