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.Common/Activities/Air/Fly.cs
View File

@@ -77,7 +77,7 @@ namespace OpenRA.Mods.Common.Activities
if (aircraft.ForceLanding)
Cancel(self);
if (IsCanceled)
if (IsCanceling)
return NextActivity;
bool targetIsHiddenActor;

2
OpenRA.Mods.Common/Activities/Air/FlyAttack.cs
View File

@@ -53,7 +53,7 @@ namespace OpenRA.Mods.Common.Activities
if (aircraft.ForceLanding)
Cancel(self);
if (IsCanceled)
if (IsCanceling)
return NextActivity;
bool targetIsHiddenActor;

2
OpenRA.Mods.Common/Activities/Air/FlyCircle.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.Activities
return NextActivity;
}
if (IsCanceled)
if (IsCanceling)
return NextActivity;
if (remainingTicks > 0)

2
OpenRA.Mods.Common/Activities/Air/FlyFollow.cs
View File

@@ -51,7 +51,7 @@ namespace OpenRA.Mods.Common.Activities
if (aircraft.ForceLanding)
Cancel(self);
if (IsCanceled)
if (IsCanceling)
return NextActivity;
bool targetIsHiddenActor;

2
OpenRA.Mods.Common/Activities/Air/FlyOffMap.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.Activities
return NextActivity;
}
if (IsCanceled || !self.World.Map.Contains(self.Location))
if (IsCanceling || !self.World.Map.Contains(self.Location))
return NextActivity;
Fly.FlyToward(self, aircraft, aircraft.Facing, aircraft.Info.CruiseAltitude);

2
OpenRA.Mods.Common/Activities/Air/FlyTimed.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Activities
return NextActivity;
}
if (IsCanceled || remainingTicks-- == 0)
if (IsCanceling || remainingTicks-- == 0)
return NextActivity;
Fly.FlyToward(self, aircraft, aircraft.Facing, cruiseAltitude);

2
OpenRA.Mods.Common/Activities/Air/HeliAttack.cs
View File

@@ -51,7 +51,7 @@ namespace OpenRA.Mods.Common.Activities
if (aircraft.ForceLanding)
Cancel(self);
if (IsCanceled)
if (IsCanceling)
return NextActivity;
bool targetIsHiddenActor;

4
OpenRA.Mods.Common/Activities/Air/HeliFly.cs
View File

@@ -73,7 +73,7 @@ namespace OpenRA.Mods.Common.Activities
if (aircraft.ForceLanding)
Cancel(self);
if (IsCanceled)
if (IsCanceling)
return NextActivity;
bool targetIsHiddenActor;
@@ -156,7 +156,7 @@ namespace OpenRA.Mods.Common.Activities
{
var activity = base.Tick(self);
if (activity == null && !IsCanceled && info.LandWhenIdle)
if (activity == null && !IsCanceling && info.LandWhenIdle)
{
if (info.TurnToLand)
self.QueueActivity(new Turn(self, info.InitialFacing));

2
OpenRA.Mods.Common/Activities/Air/HeliFlyCircle.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Activities
return NextActivity;
}
if (IsCanceled)
if (IsCanceling)
return NextActivity;
if (HeliFly.AdjustAltitude(self, aircraft, aircraft.Info.CruiseAltitude))

2
OpenRA.Mods.Common/Activities/Air/HeliLand.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Activities
public override Activity Tick(Actor self)
{
if (IsCanceled)
if (IsCanceling)
return NextActivity;
if (requireSpace && !aircraft.CanLand(self.Location))

2
OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Activities
if (aircraft.ForceLanding)
return NextActivity;
if (IsCanceled)
if (IsCanceling)
return NextActivity;
if (dest == null || dest.IsDead || !Reservable.IsAvailableFor(dest, self))

2
OpenRA.Mods.Common/Activities/Air/Land.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Activities
if (!target.IsValidFor(self))
Cancel(self);
if (IsCanceled)
if (IsCanceling)
return NextActivity;
if (!soundPlayed && aircraft.Info.LandingSounds.Length > 0 && !self.IsAtGroundLevel())

7
OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs
View File

@@ -51,11 +51,8 @@ namespace OpenRA.Mods.Common.Activities
}
// Conditional fixes being able to stop aircraft from resupplying.
if (IsCanceled && NextInQueue == null)
{
OnFirstRun(self);
return this;
}
if (IsCanceling && NextInQueue == null)
return new ResupplyAircraft(self);
return NextActivity;
}

2
OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
View File

@@ -124,7 +124,7 @@ namespace OpenRA.Mods.Common.Activities
if (aircraft.ForceLanding)
return NextActivity;
if (IsCanceled || self.IsDead)
if (IsCanceling || self.IsDead)
return NextActivity;
if (!isCalculated)