Swap the default value for FlyOffMap.Interruptible. The common case (scripted aircraft) don't want to be interruptible. Fixes badr desync caused by the mono 2.6.7 compiler dropping initializers for bools that default to true.
This commit is contained in:
@@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA.Air
|
||||
|
||||
public class FlyOffMap : Activity
|
||||
{
|
||||
public bool Interruptible = true;
|
||||
public bool Interruptible = false;
|
||||
|
||||
public override Activity Tick(Actor self)
|
||||
{
|
||||
|
||||
@@ -50,7 +50,7 @@ namespace OpenRA.Mods.RA.Air
|
||||
if (someBuilding == null)
|
||||
{
|
||||
// ... going down the garden to eat worms ...
|
||||
self.QueueActivity(new FlyOffMap());
|
||||
self.QueueActivity(new FlyOffMap() { Interruptible = true });
|
||||
self.QueueActivity(new RemoveSelf());
|
||||
return;
|
||||
}
|
||||
@@ -67,7 +67,7 @@ namespace OpenRA.Mods.RA.Air
|
||||
{
|
||||
public void TickIdle(Actor self)
|
||||
{
|
||||
self.QueueActivity(new FlyOffMap());
|
||||
self.QueueActivity(new FlyOffMap() { Interruptible = true });
|
||||
self.QueueActivity(new RemoveSelf());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ namespace OpenRA.Mods.RA
|
||||
void FinishedDropping(Actor self)
|
||||
{
|
||||
self.CancelActivity();
|
||||
self.QueueActivity(new FlyOffMap { Interruptible = false });
|
||||
self.QueueActivity(new FlyOffMap());
|
||||
self.QueueActivity(new RemoveSelf());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ namespace OpenRA.Mods.RA
|
||||
if (flare != null)
|
||||
a.QueueActivity(new CallFunc(() => flare.Destroy()));
|
||||
|
||||
a.QueueActivity(new FlyOffMap { Interruptible = false });
|
||||
a.QueueActivity(new FlyOffMap());
|
||||
a.QueueActivity(new RemoveSelf());
|
||||
});
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ namespace OpenRA.Mods.RA
|
||||
camera.QueueActivity(new Wait(25 * (Info as SpyPlanePowerInfo).RevealTime));
|
||||
camera.QueueActivity(new RemoveSelf());
|
||||
})));
|
||||
plane.QueueActivity(new FlyOffMap { Interruptible = false });
|
||||
plane.QueueActivity(new FlyOffMap());
|
||||
plane.QueueActivity(new RemoveSelf());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user