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

fixes #72

Browse Source
This commit is contained in:
Chris Forbes
2009-11-01 19:57:03 +13:00
parent b9af0d42fe
commit 98e64fc446
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRa.Game/Order.cs
View File

@@ -92,9 +92,10 @@ namespace OpenRa.Game
return new Order(subject.Owner, "Attack", subject, target, int2.Zero, null, Cursor.Attack); return new Order(subject.Owner, "Attack", subject, target, int2.Zero, null, Cursor.Attack);
} }
public static Order Move(Actor subject, int2 target) public static Order Move(Actor subject, int2 target, bool isBlocked)
{ {
return new Order(subject.Owner, "Move", subject, null, target, null, Cursor.Move); return new Order(subject.Owner, "Move", subject, null, target, null,
isBlocked ? Cursor.MoveBlocked : Cursor.Move);
} }
public static Order DeployMcv(Actor subject) public static Order DeployMcv(Actor subject)

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

@@ -53,12 +53,12 @@ namespace OpenRa.Game.Traits
if( lmb ) return null; if( lmb ) return null;
if( underCursor != null ) if( underCursor != null )
return null; return null;
if (xy == toCell) return null;
if( xy != toCell ) return OpenRa.Game.Order.Move( self, xy,
return OpenRa.Game.Order.Move( self, xy ); !Game.IsCellBuildable(xy, GetMovementType()) );
return null;
} }
public void Cancel(Actor self) public void Cancel(Actor self)