# HG changeset patch
# User Wuzzy <Wuzzy2@mail.ru>
# Date 1531001793 -7200
# Node ID 8f746b6a477cf74ced83ae95197ece3bf3a1a7c3
# Parent  2d787d122083d81acb64160dce6f8cca4cab0727
Fix teleport tooltip claiming it doesn't end turn, while in in hog placing phase with inf. attack

diff -r 2d787d122083 -r 8f746b6a477c ChangeLog.txt
--- a/ChangeLog.txt	Sat Jul 07 23:29:02 2018 +0200
+++ b/ChangeLog.txt	Sun Jul 08 00:16:33 2018 +0200
@@ -4,6 +4,7 @@
 Game:
  * Fix extreme amounts of droplets when shooting with minigun into ocean world edge
  * Fix hog being unable to walk after using sniper rifle without firing both shots
+ * Fix teleport tooltip claiming it doesn't end turn in hog placing phase with inf. attack
 
 Continental supplies:
  + Continents are now selected before the game starts
diff -r 2d787d122083 -r 8f746b6a477c hedgewars/uStore.pas
--- a/hedgewars/uStore.pas	Sat Jul 07 23:29:02 2018 +0200
+++ b/hedgewars/uStore.pas	Sun Jul 08 00:16:33 2018 +0200
@@ -1017,7 +1017,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];