From 772994c1c4b531ba083adace26491efeda7ec244 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sat, 4 Oct 2014 13:30:06 +1300
Subject: [PATCH] Remove Mobile assumptions from Lua APIs.

---
 .../Scripting/Global/ReinforcementsGlobal.cs     | 16 +++++-----------
 .../Scripting/Properties/CombatProperties.cs     |  6 +++++-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs b/OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs
index 814ff804c8..fab26c7dd4 100644
--- a/OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs
+++ b/OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs
@@ -54,17 +54,11 @@ namespace OpenRA.Mods.RA.Scripting
 
 		void Move(Actor actor, CPos dest)
 		{
-			if (actor.HasTrait<Aircraft>())
-			{
-				if (actor.HasTrait<Helicopter>())
-					actor.QueueActivity(new HeliFly(actor, Target.FromCell(actor.World, dest)));
-				else
-					actor.QueueActivity(new Fly(actor, Target.FromCell(actor.World, dest)));
-			}
-			else
-			{
-				actor.QueueActivity(new Move.Move(dest, 2));
-			}
+			var move = actor.TraitOrDefault<IMove>();
+			if (move == null)
+				return;
+
+			actor.QueueActivity(move.MoveTo(dest, 2));
 		}
 
 		[Desc("Send reinforcements consisting of multiple units. Supports ground-based, naval and air units. " +
diff --git a/OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs b/OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs
index 20b9fad366..382599b41d 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs
+++ b/OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs
@@ -33,7 +33,11 @@ namespace OpenRA.Mods.RA.Scripting
 			"close enough to complete the activity.")]
 		public void AttackMove(CPos cell, int closeEnough = 0)
 		{
-			self.QueueActivity(new AttackMove.AttackMoveActivity(self, new Move.Move(cell, WRange.FromCells(closeEnough))));
+			var move = self.TraitOrDefault<IMove>();
+			if (move == null)
+				return;
+
+			self.QueueActivity(new AttackMove.AttackMoveActivity(self, move.MoveTo(cell, closeEnough)));
 		}
 	}
 }