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

Move AmmoPool RemainingTicks reset to Rearmable

Browse Source 
This is a better place to do this than the Resupply activity.
This commit is contained in:
reaperrr
2019-06-25 02:50:34 +02:00
committed by Paul Chote
parent f71912f337
commit 1bb988512f
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Activities/Resupply.cs
View File

@@ -135,13 +135,6 @@ namespace OpenRA.Mods.Common.Activities
actualResupplyStarted = true;
foreach (var notifyResupply in notifyResupplies)
notifyResupply.BeforeResupply(host.Actor, self, activeResupplyTypes);
// Reset the ReloadDelay to avoid any issues with early cancellation
// from previous reload attempts (explicit order, host building died, etc).
// HACK: this really shouldn't be managed from here
if (activeResupplyTypes.HasFlag(ResupplyType.Rearm))
foreach (var pool in rearmable.RearmableAmmoPools)
pool.RemainingTicks = pool.Info.ReloadDelay;
}
if (activeResupplyTypes.HasFlag(ResupplyType.Repair))