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

Replaced Canceled state with Canceling state.

Browse Source
This commit is contained in:
tovl
2019-03-03 01:57:17 +01:00
committed by Paul Chote
parent 8191a6566b
commit a17cd0fa06
43 changed files with 74 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Cnc.Activities
public override Activity Tick(Actor self)
{
if (IsCanceled)
if (IsCanceling)
return NextActivity;
if (rearmableInfo != null && ammoPools.Any(p => p.Info.Name == info.AmmoPoolName && !p.HasAmmo()))

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

@@ -66,7 +66,7 @@ namespace OpenRA.Mods.Cnc.Activities
return this;
}
if (IsCanceled)
if (IsCanceling)
return NextActivity;
bool targetIsHiddenActor;

2
OpenRA.Mods.Cnc/Traits/Attack/AttackTDGunboatTurreted.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Cnc.Traits
public override Activity Tick(Actor self)
{
if (IsCanceled || !target.IsValidFor(self))
if (IsCanceling || !target.IsValidFor(self))
return NextActivity;
if (attack.IsTraitDisabled)

4
OpenRA.Mods.Cnc/Traits/Attack/AttackTesla.cs
View File

@@ -91,7 +91,7 @@ namespace OpenRA.Mods.Cnc.Traits
public override Activity Tick(Actor self)
{
if (IsCanceled || !attack.CanAttack(self, target))
if (IsCanceling || !attack.CanAttack(self, target))
return NextActivity;
if (attack.charges == 0)
@@ -120,7 +120,7 @@ namespace OpenRA.Mods.Cnc.Traits
public override Activity Tick(Actor self)
{
if (IsCanceled || !attack.CanAttack(self, target))
if (IsCanceling || !attack.CanAttack(self, target))
return NextActivity;
if (attack.charges == 0)