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

Merge pull request #11004 from obrakmann/pr10266_paradrop-production

Browse Source 
Paradrop Production
This commit is contained in:
abcdefg30
2016-04-02 13:00:47 +02:00
parent 9064f95bfd 500216937b
commit 03b56b0337
11 changed files with 189 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Activities/Parachute.cs
View File

@@ -21,15 +21,17 @@ namespace OpenRA.Mods.Common.Activities
readonly IPositionable pos;
readonly ParachutableInfo para;
readonly WVec fallVector;
readonly Actor ignore;
WPos dropPosition;
WPos currentPosition;
bool triggered = false;
public Parachute(Actor self, WPos dropPosition)
public Parachute(Actor self, WPos dropPosition, Actor ignoreActor = null)
{
um = self.TraitOrDefault<UpgradeManager>();
pos = self.TraitOrDefault<IPositionable>();
ignore = ignoreActor;
// Parachutable trait is a prerequisite for running this activity
para = self.Info.TraitInfo<ParachutableInfo>();
@@ -61,7 +63,7 @@ namespace OpenRA.Mods.Common.Activities
um.RevokeUpgrade(self, u, this);
foreach (var npl in self.TraitsImplementing<INotifyParachuteLanded>())
npl.OnLanded();
npl.OnLanded(ignore);
return NextActivity;
}