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

Remove FlyOffMap.Interruptable. Fixes #906.

Browse Source
This commit is contained in:
Paul Chote
2011-06-23 19:16:20 +12:00
parent 78502317aa
commit ef8b6b2e71
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.RA/Air/FlyTimed.cs
View File

@@ -31,8 +31,6 @@ namespace OpenRA.Mods.RA.Air
public class FlyOffMap : Activity public class FlyOffMap : Activity
{ {
public bool Interruptible = false;
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
{ {
var targetAltitude = self.Info.Traits.Get<PlaneInfo>().CruiseAltitude; var targetAltitude = self.Info.Traits.Get<PlaneInfo>().CruiseAltitude;
@@ -45,8 +43,7 @@ namespace OpenRA.Mods.RA.Air
public override void Cancel( Actor self ) public override void Cancel( Actor self )
{ {
if (Interruptible) base.Cancel(self);
base.Cancel(self);
} }
} }
} }

4
OpenRA.Mods.RA/Air/ReturnOnIdle.cs
View File

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.RA.Air
if (someBuilding == null) if (someBuilding == null)
{ {
// ... going down the garden to eat worms ... // ... going down the garden to eat worms ...
self.QueueActivity(new FlyOffMap() { Interruptible = true }); self.QueueActivity(new FlyOffMap());
self.QueueActivity(new RemoveSelf()); self.QueueActivity(new RemoveSelf());
return; return;
} }
@@ -67,7 +67,7 @@ namespace OpenRA.Mods.RA.Air
{ {
public void TickIdle(Actor self) public void TickIdle(Actor self)
{ {
self.QueueActivity(new FlyOffMap() { Interruptible = true }); self.QueueActivity(new FlyOffMap());
self.QueueActivity(new RemoveSelf()); self.QueueActivity(new RemoveSelf());
} }
} }