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

Check proc's health before (un)docking. Fixes #5338

Browse Source
This commit is contained in:
Oliver Brakmann
2014-05-17 16:57:55 +02:00
parent 578b071fd4
commit 062e7f5298
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs
View File

@@ -54,6 +54,7 @@ namespace OpenRA.Mods.Cnc
case State.Dock: case State.Dock:
ru.PlayCustomAnimation(self, "dock", () => { ru.PlayCustomAnimation(self, "dock", () => {
ru.PlayCustomAnimRepeating(self, "dock-loop"); ru.PlayCustomAnimRepeating(self, "dock-loop");
if (proc.IsInWorld && !proc.IsDead())
foreach (var nd in proc.TraitsImplementing<INotifyDocking>()) foreach (var nd in proc.TraitsImplementing<INotifyDocking>())
nd.Docked(proc, self); nd.Docked(proc, self);
state = State.Loop; state = State.Loop;
@@ -66,6 +67,7 @@ namespace OpenRA.Mods.Cnc
return this; return this;
case State.Undock: case State.Undock:
ru.PlayCustomAnimBackwards(self, "dock", () => state = State.DragOut); ru.PlayCustomAnimBackwards(self, "dock", () => state = State.DragOut);
if (proc.IsInWorld && !proc.IsDead())
foreach (var nd in proc.TraitsImplementing<INotifyDocking>()) foreach (var nd in proc.TraitsImplementing<INotifyDocking>())
nd.Undocked(proc, self); nd.Undocked(proc, self);
state = State.Wait; state = State.Wait;

2
OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs
View File

@@ -47,6 +47,7 @@ namespace OpenRA.Mods.RA
case State.Dock: case State.Dock:
ru.PlayCustomAnimation(self, "dock", () => { ru.PlayCustomAnimation(self, "dock", () => {
ru.PlayCustomAnimRepeating(self, "dock-loop"); ru.PlayCustomAnimRepeating(self, "dock-loop");
if (proc.IsInWorld && !proc.IsDead())
foreach (var nd in proc.TraitsImplementing<INotifyDocking>()) foreach (var nd in proc.TraitsImplementing<INotifyDocking>())
nd.Docked(proc, self); nd.Docked(proc, self);
state = State.Loop; state = State.Loop;
@@ -64,6 +65,7 @@ namespace OpenRA.Mods.RA
case State.Complete: case State.Complete:
harv.LastLinkedProc = harv.LinkedProc; harv.LastLinkedProc = harv.LinkedProc;
harv.LinkProc(self, null); harv.LinkProc(self, null);
if (proc.IsInWorld && !proc.IsDead())
foreach (var nd in proc.TraitsImplementing<INotifyDocking>()) foreach (var nd in proc.TraitsImplementing<INotifyDocking>())
nd.Undocked(proc, self); nd.Undocked(proc, self);
return NextActivity; return NextActivity;