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

Added attack order. Cursor is currently incorrect.

Browse Source
This commit is contained in:
Bob
2009-10-26 23:25:35 +13:00
parent 612490e5b8
commit 3ef0f90b00
5 changed files with 52 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,9 +47,12 @@ namespace OpenRa.Game.Traits
fromCell = toCell;
}
public Order Order(Actor self, int2 xy, bool lmb)
public Order Order(Actor self, int2 xy, bool lmb, Actor underCursor)
{
if( lmb ) return null;
if( lmb ) return null;
if( underCursor != null )
return null;
if (xy != toCell)
return new MoveOrder(self, xy);
@@ -248,21 +251,21 @@ namespace OpenRa.Game.Traits
{
var nextCell = parent.path[ parent.path.Count - 1 ];
if( ( nextCell - mobile.toCell ) != ( mobile.toCell - mobile.fromCell ) )
{
if( CanEnterCell( nextCell, self ) )
{
parent.path.RemoveAt( parent.path.Count - 1 );
var ret = new MoveFirstHalf(
BetweenCells( mobile.fromCell, mobile.toCell ),
BetweenCells( mobile.toCell, nextCell ),
mobile.facing,
Util.GetNearestFacing( mobile.facing, Util.GetFacing( nextCell - mobile.toCell, mobile.facing ) ),
moveFraction - moveFractionTotal );
mobile.fromCell = mobile.toCell;
mobile.toCell = nextCell;
Game.UnitInfluence.Update( mobile );
return ret;
{
if( CanEnterCell( nextCell, self ) )
{
parent.path.RemoveAt( parent.path.Count - 1 );
var ret = new MoveFirstHalf(
BetweenCells( mobile.fromCell, mobile.toCell ),
BetweenCells( mobile.toCell, nextCell ),
mobile.facing,
Util.GetNearestFacing( mobile.facing, Util.GetFacing( nextCell - mobile.toCell, mobile.facing ) ),
moveFraction - moveFractionTotal );
mobile.fromCell = mobile.toCell;
mobile.toCell = nextCell;
Game.UnitInfluence.Update( mobile );
return ret;
}
}
}