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

Merge pull request #9462 from abcdefg30/sovietfix

Browse Source 
Fix a crash in the soviet04 missions
This commit is contained in:
Oliver Brakmann
2015-10-06 20:27:16 +02:00
parent d4863badb6 3a68364bc5
commit cd62044a3a
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mods/ra/maps/soviet-04a/main.lua
View File

@@ -37,14 +37,21 @@ RunInitialActivities = function()
Trigger.OnEnteredFootprint(VillageCamArea, function(actor, id) Trigger.OnEnteredFootprint(VillageCamArea, function(actor, id)
if actor.Owner == player then if actor.Owner == player then
local camera = Actor.Create("camera", true, { Owner = player, Location = VillagePoint.Location })
Trigger.RemoveFootprintTrigger(id) Trigger.RemoveFootprintTrigger(id)
Trigger.OnAllKilled(Village, function()
camera.Destroy() if not AllVillagersDead then
end) VillageCamera = Actor.Create("camera", true, { Owner = player, Location = VillagePoint.Location })
end
end end
end) end)
Trigger.OnAllKilled(Village, function()
if VillageCamera then
VillageCamera.Destroy()
end
AllVillagersDead = true
end)
Trigger.OnAnyKilled(Civs, function() Trigger.OnAnyKilled(Civs, function()
Trigger.ClearAll(civ1) Trigger.ClearAll(civ1)
Trigger.ClearAll(civ2) Trigger.ClearAll(civ2)

15
mods/ra/maps/soviet-04b/main.lua
View File

@@ -39,14 +39,21 @@ RunInitialActivities = function()
Trigger.OnEnteredFootprint(VillageCamArea, function(actor, id) Trigger.OnEnteredFootprint(VillageCamArea, function(actor, id)
if actor.Owner == player then if actor.Owner == player then
local camera = Actor.Create("camera", true, { Owner = player, Location = VillagePoint.Location })
Trigger.RemoveFootprintTrigger(id) Trigger.RemoveFootprintTrigger(id)
Trigger.OnAllKilled(Village, function()
camera.Destroy() if not AllVillagersDead then
end) VillageCamera = Actor.Create("camera", true, { Owner = player, Location = VillagePoint.Location })
end
end end
end) end)
Trigger.OnAllKilled(Village, function()
if VillageCamera then
VillageCamera.Destroy()
end
AllVillagersDead = true
end)
Trigger.OnAnyKilled(Civs, function() Trigger.OnAnyKilled(Civs, function()
Trigger.ClearAll(civ1) Trigger.ClearAll(civ1)
Trigger.ClearAll(civ2) Trigger.ClearAll(civ2)