Revert "add IHasLocation"

This reverts commit 699b4b1154.
2010-09-28 07:43:49 +13:00
parent a3c0448e15
commit f402ec7898
31 changed files with 105 additions and 136 deletions
--- a/OpenRA.Mods.RA/Effects/Parachute.cs
+++ b/OpenRA.Mods.RA/Effects/Parachute.cs
@@ -58,7 +58,18 @@ namespace OpenRA.Mods.RA.Effects
 						w.Remove(this);
 						var loc = Traits.Util.CellContaining(location);
 						cargo.CancelActivity();
-						cargo.Trait<ITeleportable>().SetPosition(cargo, loc);
+						
+						var mobile = cargo.TraitOrDefault<ITeleportable>();
+
+						if (mobile != null)
+							mobile.SetPosition(cargo, loc);
+						else
+						{
+							cargo.CenterLocation = Traits.Util.CenterOfCell(loc);
+
+							if (cargo.HasTrait<IOccupySpace>())
+								world.WorldActor.Trait<UnitInfluence>().Add(cargo, cargo.Trait<IOccupySpace>());
+						}
 						w.Add(cargo);
 					});
 		}