lots of heli fixes

2009-12-31 11:17:28 +13:00
parent d52c7fba0b
commit 0edadeb7af
5 changed files with 43 additions and 20 deletions
--- a/OpenRa.Game/Traits/Reservable.cs
+++ b/OpenRa.Game/Traits/Reservable.cs
@@ -7,8 +7,6 @@ namespace OpenRa.Game.Traits
 		public Reservable(Actor self) { }
 		Actor reservedFor;

-		public bool IsReserved { get { return reservedFor != null; } }
-
 		public void Tick(Actor self)
 		{
 			if (reservedFor == null) 
@@ -22,5 +20,11 @@ namespace OpenRa.Game.Traits
 			reservedFor = forActor;
 			return new DisposableAction(() => reservedFor = null);
 		}
+
+		public static bool IsReserved(Actor a)
+		{
+			var res = a.traits.GetOrDefault<Reservable>();
+			return res != null && res.reservedFor != null;
+		}
 	}
 }