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

Fix units from transports appearing at load point.

Browse Source
This commit is contained in:
tovl
2019-08-12 00:46:54 +02:00
committed by abcdefg30
parent 70459b311e
commit 2d394f33b8
22 changed files with 186 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,6 +62,8 @@ namespace OpenRA.Mods.Common.Traits
readonly ParachutableInfo info;
readonly IPositionable positionable;
public Actor IgnoreActor;
ConditionManager conditionManager;
int parachutingToken = ConditionManager.InvalidConditionToken;
@@ -86,7 +88,7 @@ namespace OpenRA.Mods.Common.Traits
parachutingToken = conditionManager.GrantCondition(self, info.ParachutingCondition);
}
void INotifyParachute.OnLanded(Actor self, Actor ignore)
void INotifyParachute.OnLanded(Actor self)
{
IsInAir = false;
@@ -100,7 +102,7 @@ namespace OpenRA.Mods.Common.Traits
if (positionable.CanEnterCell(cell, self))
return;
if (ignore != null && self.World.ActorMap.GetActorsAt(cell).Any(a => a != ignore))
if (IgnoreActor != null && self.World.ActorMap.GetActorsAt(cell).Any(a => a != IgnoreActor))
return;
var onWater = info.WaterTerrainTypes.Contains(self.World.Map.GetTerrainInfo(cell).Type);