From c12527e866883c4ff2a11d0503ed2434cfb70ad5 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Sun, 22 Jun 2014 13:58:33 +0200 Subject: [PATCH] Remove workaround for #4482 from 'Intervention' mission --- mods/ra/maps/intervention/mission.lua | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/mods/ra/maps/intervention/mission.lua b/mods/ra/maps/intervention/mission.lua index d5700b24dc..4950c8d1cb 100644 --- a/mods/ra/maps/intervention/mission.lua +++ b/mods/ra/maps/intervention/mission.lua @@ -77,7 +77,6 @@ FollowWaypoints = function(team, waypoints) end PlaneExitMap = function(actor, exitPoint) - Actor.Stop(actor) Actor.Fly(actor, exitPoint.CenterPosition) Actor.FlyOffMap(actor) Actor.RemoveSelf(actor) @@ -94,15 +93,9 @@ BaseRaid = function() local flight = Team.New(Reinforcements.ReinforceAir(soviets, BaseRaidAircraft, BaseRaidEntrypoint, BaseRaidWpts[1], Utils.Seconds(1))) FollowWaypoints(flight, BaseRaidWpts) - -- this is a workaround for bug #4482 - Actor.OnDamaged(target, function() - Team.Do(flight, function(plane) - PlaneExitMap(plane, VillageRaidEntrypoint) - end) - end) - Team.Do(flight, function(plane) Actor.FlyAttackActor(plane, target) + PlaneExitMap(plane, VillageRaidEntrypoint) end) OpenRA.RunAfterDelay(BaseRaidInterval, BaseRaid) @@ -124,15 +117,9 @@ VillageRaid = function() local flight = Team.New(Reinforcements.ReinforceAir(soviets, VillageRaidAircraft, VillageRaidEntrypoint, VillageRaidWpts[1], Utils.Seconds(1))) FollowWaypoints(flight, VillageRaidWpts) - -- this is a workaround for bug #4482 - Actor.OnDamaged(target, function() - Team.Do(flight, function(actor) - PlaneExitMap(actor, BaseRaidEntrypoint) - end) - end) - Team.Do(flight, function(plane) Actor.FlyAttackActor(plane, target) + PlaneExitMap(plane, BaseRaidEntrypoint) end) OpenRA.RunAfterDelay(VillageRaidInterval, VillageRaid)