epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spawn ejected pilots inside a FrameEndTask.

Browse Source
This commit is contained in:
Paul Chote
2019-11-16 20:08:57 +00:00
committed by abcdefg30
parent 04912ea996
commit 6b1e81a7b5
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/EjectOnDeath.cs
View File

@@ -58,6 +58,8 @@ namespace OpenRA.Mods.Common.Traits
if ((inAir && !Info.EjectInAir) || (!inAir && !Info.EjectOnGround)) if ((inAir && !Info.EjectInAir) || (!inAir && !Info.EjectOnGround))
return; return;
self.World.AddFrameEndTask(w =>
{
if (!Info.AllowUnsuitableCell) if (!Info.AllowUnsuitableCell)
{ {
var pilotInfo = self.World.Map.Rules.Actors[Info.PilotActor.ToLowerInvariant()]; var pilotInfo = self.World.Map.Rules.Actors[Info.PilotActor.ToLowerInvariant()];
@@ -89,16 +91,14 @@ namespace OpenRA.Mods.Common.Traits
var pilot = self.World.CreateActor(true, Info.PilotActor.ToLowerInvariant(), td); var pilot = self.World.CreateActor(true, Info.PilotActor.ToLowerInvariant(), td);
if (!inAir) if (!inAir)
{
self.World.AddFrameEndTask(w =>
{ {
var pilotMobile = pilot.TraitOrDefault<Mobile>(); var pilotMobile = pilot.TraitOrDefault<Mobile>();
if (pilotMobile != null) if (pilotMobile != null)
pilotMobile.Nudge(pilot); pilotMobile.Nudge(pilot);
});
} }
else else
Game.Sound.Play(SoundType.World, Info.ChuteSound, cp); Game.Sound.Play(SoundType.World, Info.ChuteSound, cp);
});
} }
} }
} }