From 47080d5dc0446b26944d2b689780c8826c42e6be Mon Sep 17 00:00:00 2001
From: clemty <clemty@gmail.com>
Date: Sat, 3 Sep 2016 22:54:41 +0200
Subject: [PATCH] fix removal of cameras in nod07a and nod08a fixes #11963

---
 mods/cnc/maps/nod07a/nod07a.lua       |  2 +-
 mods/cnc/maps/nod08a/nod08a.lua       |  2 +-
 mods/cnc/maps/nod08b/nod08b.lua       |  4 ++--
 mods/ra/maps/soviet-02b/soviet02b.lua | 10 +++++-----
 mods/ra/maps/soviet-06a/soviet06a.lua | 10 +++++-----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mods/cnc/maps/nod07a/nod07a.lua b/mods/cnc/maps/nod07a/nod07a.lua
index cab7cb2d41..754c039ad8 100644
--- a/mods/cnc/maps/nod07a/nod07a.lua
+++ b/mods/cnc/maps/nod07a/nod07a.lua
@@ -216,7 +216,7 @@ Trigger.OnEnteredFootprint(ReinforcementsTrigger, function(a, id)
 
 		Trigger.AfterDelay(DateTime.Minutes(2), function()
 			Flare.Destroy()
-			FlareCamera.Kill()
+			FlareCamera.Destroy()
 		end)
 	end
 end)
diff --git a/mods/cnc/maps/nod08a/nod08a.lua b/mods/cnc/maps/nod08a/nod08a.lua
index 0230e77f88..364432ef25 100644
--- a/mods/cnc/maps/nod08a/nod08a.lua
+++ b/mods/cnc/maps/nod08a/nod08a.lua
@@ -153,7 +153,7 @@ Trigger.OnAllKilledOrCaptured(Outpost, function()
 		end)
 
 		Trigger.AfterDelay(DateTime.Minutes(1), function()
-			FlareCamera.Kill()
+			FlareCamera.Destroy()
 			Flare.Destroy()
 		end)
 
diff --git a/mods/cnc/maps/nod08b/nod08b.lua b/mods/cnc/maps/nod08b/nod08b.lua
index 8b280dd5db..7fabec8eb1 100644
--- a/mods/cnc/maps/nod08b/nod08b.lua
+++ b/mods/cnc/maps/nod08b/nod08b.lua
@@ -155,8 +155,8 @@ Trigger.OnAllKilledOrCaptured(Outpost, function()
 		end)
 
 		Trigger.AfterDelay(DateTime.Minutes(1), function()
-			FlareCamera1.Kill()
-			FlareCamera2.Kill()
+			FlareCamera1.Destroy()
+			FlareCamera2.Destroy()
 			Flare.Destroy()
 		end)
 
diff --git a/mods/ra/maps/soviet-02b/soviet02b.lua b/mods/ra/maps/soviet-02b/soviet02b.lua
index 2e4a101c98..15bdbcf6ac 100644
--- a/mods/ra/maps/soviet-02b/soviet02b.lua
+++ b/mods/ra/maps/soviet-02b/soviet02b.lua
@@ -27,7 +27,7 @@ Trigger.OnEnteredFootprint(BridgeShroudTrigger, function(a, id)
 		bridgeShroudTrigger = true
 		local cameraBridge = Actor.Create("camera", true, { Owner = player, Location = CameraBridge.Location })
 		Trigger.AfterDelay(DateTime.Seconds(15), function()
-			cameraBridge.Kill()
+			cameraBridge.Destroy()
 		end)
 	end
 end)
@@ -46,7 +46,7 @@ Trigger.OnEnteredFootprint(EnemyBaseEntranceShroudTrigger, function(a, id)
 		enemyBaseEntranceShroudTrigger = true
 		local cameraBaseEntrance = Actor.Create("camera", true, { Owner = player, Location = CameraBaseEntrance.Location })
 		Trigger.AfterDelay(DateTime.Seconds(15), function()
-			cameraBaseEntrance.Kill()
+			cameraBaseEntrance.Destroy()
 		end)
 	end
 end)
@@ -57,8 +57,8 @@ Trigger.OnEnteredFootprint(EnemyBaseShroudTrigger, function(a, id)
 		local cameraBase1 = Actor.Create("camera", true, { Owner = player, Location = CameraBase1.Location })
 		local cameraBase2 = Actor.Create("camera", true, { Owner = player, Location = CameraBase2.Location })
 		Trigger.AfterDelay(DateTime.Seconds(15), function()
-			cameraBase1.Kill()
-			cameraBase2.Kill()
+			cameraBase1.Destroy()
+			cameraBase2.Destroy()
 		end)
 	end
 end)
@@ -115,7 +115,7 @@ end)
 Trigger.OnKilled(IntroSoldier1, function()
 	local cameraIntro = Actor.Create("camera", true, { Owner = player, Location = CameraStart.Location })
 	Trigger.AfterDelay(DateTime.Seconds(15), function()
-		cameraIntro.Kill()
+		cameraIntro.Destroy()
 	end)
 end)
 
diff --git a/mods/ra/maps/soviet-06a/soviet06a.lua b/mods/ra/maps/soviet-06a/soviet06a.lua
index 64fe67e53c..53e8bd0af1 100644
--- a/mods/ra/maps/soviet-06a/soviet06a.lua
+++ b/mods/ra/maps/soviet-06a/soviet06a.lua
@@ -30,7 +30,7 @@ Trigger.OnEnteredFootprint(CameraBarrierTrigger, function(a, id)
 		cameraBarrierTrigger = true
 		local cameraBarrier = Actor.Create("camera", true, { Owner = player, Location = CameraBarrier.Location })
 		Trigger.AfterDelay(DateTime.Seconds(15), function()
-			cameraBarrier.Kill()
+			cameraBarrier.Destroy()
 		end)
 	end
 end)
@@ -43,10 +43,10 @@ Trigger.OnEnteredFootprint(CameraBaseTrigger, function(a, id)
 		local cameraBase3 = Actor.Create("camera", true, { Owner = player, Location = CameraBase3.Location })
 		local cameraBase4 = Actor.Create("camera", true, { Owner = player, Location = CameraBase4.Location })
 		Trigger.AfterDelay(DateTime.Minutes(1), function()
-			cameraBase1.Kill()
-			cameraBase2.Kill()
-			cameraBase3.Kill()
-			cameraBase4.Kill()
+			cameraBase1.Destroy()
+			cameraBase2.Destroy()
+			cameraBase3.Destroy()
+			cameraBase4.Destroy()
 		end)
 	end
 end)