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

Add a CanDeploy check to Transform at FrameEndTask

Browse Source
This commit is contained in:
Gustas
2022-12-07 11:56:44 +02:00
committed by Matthias Mailänder
parent 43bb9e4302
commit 8a18c2e4b6
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.Common/Activities/Transform.cs
View File

@@ -66,15 +66,15 @@ namespace OpenRA.Mods.Common.Activities
// Wait forever // Wait forever
QueueChild(new WaitFor(() => false)); QueueChild(new WaitFor(() => false));
makeAnimation.Reverse(self, () => DoTransform(self)); makeAnimation.Reverse(self, () => DoTransform(self, transforms, makeAnimation));
return false; return false;
} }
DoTransform(self); DoTransform(self, transforms, null);
return true; return true;
} }
void DoTransform(Actor self) void DoTransform(Actor self, Transforms transforms, WithMakeAnimation makeAnimation)
{ {
// This activity may be buried as a child within one or more parents // This activity may be buried as a child within one or more parents
// We need to consider the top-level activities when transferring orders to the new actor! // We need to consider the top-level activities when transferring orders to the new actor!
@@ -85,6 +85,20 @@ namespace OpenRA.Mods.Common.Activities
if (self.IsDead || self.WillDispose) if (self.IsDead || self.WillDispose)
return; return;
// Prevent deployment in bogus locations
if (transforms != null && !transforms.CanDeploy())
{
if (!SkipMakeAnims && makeAnimation != null)
makeAnimation.Forward(self, () => { IsInterruptible = true; Cancel(self, true); });
else
{
IsInterruptible = true;
Cancel(self, true);
}
return;
}
foreach (var nt in self.TraitsImplementing<INotifyTransform>()) foreach (var nt in self.TraitsImplementing<INotifyTransform>())
nt.OnTransform(self); nt.OnTransform(self);