force-fire etc with stances

This commit is contained in:
Chris Forbes
2010-03-19 18:34:21 +13:00
parent 0eb1646565
commit 793a337797

View File

@@ -214,13 +214,13 @@ namespace OpenRA.Traits
{
if (underCursor.Owner == null)
return null;
if (underCursor.Owner != self.Owner && !forceFire)
if (self.Owner.Stances[ underCursor.Owner ] != Stance.Ally && !forceFire)
return null;
if (underCursor.Health >= underCursor.GetMaxHP())
return null; // don't allow healing of fully-healed stuff!
}
else
if ((underCursor.Owner == self.Owner || underCursor.Owner == null) && !forceFire)
if ((self.Owner.Stances[ underCursor.Owner ] != Stance.Enemy) && !forceFire)
return null;
if (!Combat.HasAnyValidWeapons(self, underCursor)) return null;