Convert Parachutable to conditions.

This commit is contained in:
Paul Chote
2016-12-03 16:46:40 +00:00
parent a846e484c7
commit bcb3d52eb0
7 changed files with 45 additions and 24 deletions

View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Traits
}
class Crate : ITick, IPositionable, ICrushable, ISync,
INotifyParachuteLanded, INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyCrushed
INotifyParachute, INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyCrushed
{
readonly Actor self;
readonly CrateInfo info;
@@ -70,7 +70,8 @@ namespace OpenRA.Mods.Common.Traits
OnCrushInner(crusher);
}
void INotifyParachuteLanded.OnLanded(Actor ignore)
void INotifyParachute.OnParachute(Actor self) { }
void INotifyParachute.OnLanded(Actor self, Actor ignore)
{
// Check whether the crate landed on anything
var landedOn = self.World.ActorMap.GetActorsAt(self.Location)