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

force-move; cleaning some dead bits; etc

Browse Source
This commit is contained in:
Chris Forbes
2009-12-23 21:48:15 +13:00
parent 8fa02ea6a3
commit 982fde6d0a
6 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,14 @@ namespace OpenRa.Game.Traits
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{
if (mi.Button == MouseButton.Left) return null;
if (underCursor != null) return null;
if (underCursor != null)
{
// force-move
if (!mi.Modifiers.HasModifier(Modifiers.Alt)) return null;
if (!Game.IsActorCrushableByActor(underCursor, self)) return null;
}
if (Util.GetEffectiveSpeed(self) == 0) return null; /* allow disabling move orders from modifiers */
if (xy == toCell) return null;
return Order.Move(self, xy);