#8 hardcoded refs to afld/hpad/fix

2010-04-17 10:01:42 +12:00
parent e3ac2a4e88
commit 4b70fa6594
4 changed files with 14 additions and 8 deletions
--- a/OpenRA.Game/Traits/Activities/HeliReturn.cs
+++ b/OpenRA.Game/Traits/Activities/HeliReturn.cs
@@ -29,8 +29,9 @@ namespace OpenRA.Traits.Activities

 		static Actor ChooseHelipad(Actor self)
 		{
+			var rearmBuildings = self.Info.Traits.Get<HelicopterInfo>().RearmBuildings;
 			return self.World.Queries.OwnedBy[self.Owner].FirstOrDefault(
-				a => a.Info.Name == "hpad" &&
+				a => rearmBuildings.Contains(a.Info.Name) &&
 					!Reservable.IsReserved(a));
 		}