# HG changeset patch
# User Wuzzy <Wuzzy2@mail.ru>
# Date 1535925786 -7200
# Node ID d7b72ea8d136b09751ff1acf503d9b68dfe73704
# Parent  cb2857f55130940ddf19cf224f5a7ac921f69199
Fix buggy behaviour when setting TurnTimeLeft through Retreat

diff -r cb2857f55130 -r d7b72ea8d136 hedgewars/uScript.pas
--- a/hedgewars/uScript.pas	Sun Sep 02 22:05:45 2018 +0200
+++ b/hedgewars/uScript.pas	Mon Sep 03 00:03:06 2018 +0200
@@ -2018,9 +2018,10 @@
         else
             respectFactor:= True;
         if respectFactor then
-            TurnTimeLeft:= (time * cGetAwayTime) div 100
+            PendingTurnTimeLeft:= (time * cGetAwayTime) div 100
         else
-            TurnTimeLeft:= time;
+            PendingTurnTimeLeft:= time;
+        isPendingTurnTimeLeft:= true;
         if ((CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil)) then
             begin
             CurrentHedgehog^.Gear^.State:= CurrentHedgehog^.Gear^.State or gstAttacked;
diff -r cb2857f55130 -r d7b72ea8d136 share/hedgewars/Data/Scripts/Multiplayer/Continental_supplies.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/Continental_supplies.lua	Sun Sep 02 22:05:45 2018 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Continental_supplies.lua	Mon Sep 03 00:03:06 2018 +0200
@@ -53,9 +53,11 @@
 	-- Set attacked state to prevent “Boring” sound to be played
 	SetState(CurrentHedgehog, bor(GetState(CurrentHedgehog), gstAttacked))
 	--set escape time
-	SetTurnTimeLeft(GetAwayTime*10*seconds)
-	if TurnTimeLeft > 0 then
-		Retreat(TurnTimeLeft, false)
+	local escapeTime = GetAwayTime*10*seconds
+	if escapeTime > 0 then
+		Retreat(escapeTime, false)
+	else
+		SetTurnTimeLeft(escapeTime)
 	end
  end