# HG changeset patch
# User Wuzzy <Wuzzy2@mail.ru>
# Date 1532456132 -7200
# Node ID 7259891805f943d3dfa1012d43a2fc826a8f4de2
# Parent  d42237d16acf2b5b78e46ada2234e1caa9e3c4a7
Fix teleport tooltip claiming it doesn't end turn in hog placing phase with inf. attack

diff -r d42237d16acf -r 7259891805f9 ChangeLog.txt
--- a/ChangeLog.txt	Tue Jul 24 20:07:58 2018 +0200
+++ b/ChangeLog.txt	Tue Jul 24 20:15:32 2018 +0200
@@ -5,6 +5,7 @@
  * Fix crash when starting game with 2 controllers or more
  * Fix insane amount of droplets appearing when shooting minigun into ocean world edge
  * Limit number of droplets to 50 (temporary bugfix)
+ * Fix teleport tooltip claiming it doesn't end turn in hog placing phase with inf. attack
  + Add default controls for controllers (see README)
 
 ====================== 0.9.24.1 ====================
diff -r d42237d16acf -r 7259891805f9 hedgewars/uStore.pas
--- a/hedgewars/uStore.pas	Tue Jul 24 20:07:58 2018 +0200
+++ b/hedgewars/uStore.pas	Tue Jul 24 20:15:32 2018 +0200
@@ -1016,7 +1016,7 @@
         extra:= trmsg[sidNotYetAvailable];
     extracolor:= LongInt($ffc77070);
     end
-else if (((GameFlags and gfInfAttack) <> 0) and ((Ammoz[atype].Ammo.Propz and ammoprop_ForceTurnEnd) = 0)) or ((Ammoz[atype].Ammo.Propz and ammoprop_NoRoundEnd) <> 0) then
+else if ((((GameFlags and gfInfAttack) <> 0) and ((Ammoz[atype].Ammo.Propz and ammoprop_ForceTurnEnd) = 0)) or ((Ammoz[atype].Ammo.Propz and ammoprop_NoRoundEnd) <> 0)) and (not (PlacingHogs and (atype = amTeleport))) then
     // weapon or utility will not end your turn
     begin
     extra:= trmsg[sidNoEndTurn];