From 8994671352962c4684a15272844a085cd8168f21 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Tue, 19 Jan 2010 15:36:36 +1300
Subject: [PATCH] offer Move on bridges

---
 OpenRa.Game/Traits/Mobile.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenRa.Game/Traits/Mobile.cs b/OpenRa.Game/Traits/Mobile.cs
index 244bdffd1c..d0ad28b242 100644
--- a/OpenRa.Game/Traits/Mobile.cs
+++ b/OpenRa.Game/Traits/Mobile.cs
@@ -54,8 +54,11 @@ namespace OpenRa.Traits
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button == MouseButton.Left) return null;
+
+			// force-fire should *always* take precedence over move.
+			if (mi.Modifiers.HasModifier(Modifiers.Ctrl)) return null;
 		
-			if (underCursor != null)
+			if (underCursor != null && underCursor.Owner != null)
 			{
 				// force-move
 				if (!mi.Modifiers.HasModifier(Modifiers.Alt)) return null;