Merge branch 'master' of git://github.com/chrisforbes/OpenRA

2009-12-23 22:24:31 +13:00
parent 9e950c84ca a6c8b234a5
commit 2a0623a601
6 changed files with 33 additions and 36 deletions
--- a/OpenRa.Game/Traits/TraitsInterfaces.cs
+++ b/OpenRa.Game/Traits/TraitsInterfaces.cs
@@ -64,6 +64,6 @@ namespace OpenRa.Game.Traits
 		bool IsCrushableByFriend();
 		bool IsCrushableByEnemy();
 		void OnCrush(Actor crusher);
-		IEnumerable<UnitMovementType>CrushableBy();
+		bool CrushableBy(UnitMovementType umt);
 	}
 }