Fix repair depot crash

This commit is contained in:
Paul Chote
2011-06-26 16:12:18 +12:00
parent 2cdc3c4288
commit 3ec5693f69

View File

@@ -17,21 +17,21 @@ namespace OpenRA.Mods.RA.Activities
{
public class Rearm : Activity
{
readonly LimitedAmmo limitedAmmo;
int ticksPerPip = 25 * 2;
int remainingTicks = 25 * 2;
public Rearm(Actor actor)
{
ticksPerPip = actor.TraitOrDefault<LimitedAmmo>().ReloadTimePerAmmo();
public Rearm(Actor self)
{
limitedAmmo = self.TraitOrDefault<LimitedAmmo>();
if (limitedAmmo != null)
ticksPerPip = limitedAmmo.ReloadTimePerAmmo();
remainingTicks = ticksPerPip;
}
public override Activity Tick(Actor self)
{
if (IsCanceled) return NextActivity;
var limitedAmmo = self.TraitOrDefault<LimitedAmmo>();
if (limitedAmmo == null) return NextActivity;
if (IsCanceled || limitedAmmo == null) return NextActivity;
if (--remainingTicks == 0)
{