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

Revert "Suppress MoveIntoWorldInit for map-placed Mobile actors."

Browse Source 
This reverts commit f0c28cc15334c7224630c375d669274f8da8fb31.
This commit is contained in:
Paul Chote
2019-10-15 20:51:16 +01:00
committed by abcdefg30
parent f5f626cd89
commit 9b4d149a06
4 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -143,7 +143,7 @@ namespace OpenRA.Mods.Common.Traits
{
readonly Actor self;
readonly Lazy<IEnumerable<int>> speedModifiers;
readonly int? moveIntoWorldDelay;
readonly int moveIntoWorldDelay;
#region IMove CurrentMovementTypes
MovementType movementTypes;
@@ -243,8 +243,7 @@ namespace OpenRA.Mods.Common.Traits
if (init.Contains<CenterPositionInit>())
SetVisualPosition(self, init.Get<CenterPositionInit, WPos>());
if (!init.Contains<SkipMoveIntoWorldInit>())
moveIntoWorldDelay = init.Contains<MoveIntoWorldDelayInit>() ? init.Get<MoveIntoWorldDelayInit, int>() : 0;
moveIntoWorldDelay = init.Contains<MoveIntoWorldDelayInit>() ? init.Get<MoveIntoWorldDelayInit, int>() : 0;
}
protected override void Created(Actor self)
@@ -899,7 +898,7 @@ namespace OpenRA.Mods.Common.Traits
Activity ICreationActivity.GetCreationActivity()
{
return moveIntoWorldDelay.HasValue ? MoveIntoWorld(self, moveIntoWorldDelay.Value) : null;
return MoveIntoWorld(self, moveIntoWorldDelay);
}
class MoveOrderTargeter : IOrderTargeter