ACF: Replace TurnTimeLeft=0 with EndTurn(true)
authorWuzzy <almikes@aol.com>
Wed, 27 Sep 2017 15:45:42 +0200
changeset 12560 d51ea6ac1ca1
parent 12559 194b00c4ba07
child 12561 846fa8bb856e
ACF: Replace TurnTimeLeft=0 with EndTurn(true)
share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua
share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua
share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua	Wed Sep 27 06:38:51 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua	Wed Sep 27 15:45:42 2017 +0200
@@ -447,7 +447,7 @@
   end
   RestoreHedge(cyborg)
   DeleteGear(cyborg)
-  TurnTimeLeft = 0
+  EndTurn(true)
 end
 
 function CheckGearsDead(gearList)
@@ -467,7 +467,7 @@
 function EndMission()
   RestoreHedge(cyborg)
   DeleteGear(cyborg)
-  TurnTimeLeft = 0
+  EndTurn(true)
 end
 
 function CheckFreshDead()
@@ -684,7 +684,7 @@
     end
     TurnTimeLeft = 30000
   elseif GetHogTeamName(CurrentHedgehog) == loc("011101001") then
-    TurnTimeLeft = 0
+    EndTurn(true)
   else
     SetInputMask(0xFFFFFFFF)
   end
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua	Wed Sep 27 06:38:51 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua	Wed Sep 27 15:45:42 2017 +0200
@@ -467,7 +467,7 @@
     SetGearPosition(enemy, unpack(enemyPos))
   end
   if GetHogTeamName(CurrentHedgehog) ~= loc("Natives") then
-    TurnTimeLeft = 0
+    EndTurn(true)
   end
   AnimWait(enemy, 1)
 end
@@ -489,7 +489,7 @@
   SetHealth(SpawnHealthCrate(2143, 54), 25)
   SetHealth(SpawnHealthCrate(70, 1308), 25)
   ShowMission(loc("Long Live The Queen"), loc("Bullseye"), loc("Good job! Defeat the rest of the aliens!"), 1, 0)
-  TurnTimeLeft = 0
+  EndTurn(true)
 end
 -----------------------------Events------------------------------------
 function CheckTurnsOver()
@@ -513,7 +513,7 @@
   RemoveEventFunc(CheckGearDead)
   RemoveEventFunc(CheckCyborgsDead)
   AddCaption(loc("And so the cyborgs took over the island."))
-  TurnTimeLeft = 0
+  EndTurn(true)
 end
 
 function CheckCyborgsDead()
@@ -525,7 +525,7 @@
     DismissTeam(loc("Leaderbot"))
   end
   DismissTeam(loc("011101001"))
-  TurnTimeLeft = 0
+  EndTurn(true)
 end
 
 function DoCyborgsDead()
@@ -812,7 +812,7 @@
     return
   end
   if GetHogTeamName(CurrentHedgehog) == loc("011101001") then
-    TurnTimeLeft = 0
+    EndTurn(true)
   end
 end
 
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua	Wed Sep 27 06:38:51 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua	Wed Sep 27 15:45:42 2017 +0200
@@ -80,7 +80,7 @@
 end
 
 function AfterWave2Anim()
-  TurnTimeLeft = 0
+  EndTurn(true)
 end
 
 function AfterFinalAnim()
@@ -113,7 +113,7 @@
     SaveCampaignVar("Progress", "4")
   end
   DismissTeam(loc("011101001"))
-  TurnTimeLeft = 0
+  EndTurn(true)
 end
 -----------------------------Animations--------------------------------
 function Wave2Reaction()