Show sidNoEndTurn text for most weapons when in inf attack mode
authorWuzzy <Wuzzy2@mail.ru>
Sat, 17 Mar 2018 17:47:42 +0100
changeset 13242 0171519e2f13
parent 13241 ef1393c6bd12
child 13245 950186baa764
Show sidNoEndTurn text for most weapons when in inf attack mode
hedgewars/uStore.pas
--- a/hedgewars/uStore.pas	Sat Mar 17 15:51:45 2018 +0100
+++ b/hedgewars/uStore.pas	Sat Mar 17 17:47:42 2018 +0100
@@ -1016,7 +1016,8 @@
         extra:= trmsg[sidNotYetAvailable];
     extracolor:= LongInt($ffc77070);
     end
-else if (Ammoz[atype].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then // weapon or utility will not end your turn
+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
+    // weapon or utility will not end your turn
     begin
     extra:= trmsg[sidNoEndTurn];
     extracolor:= LongInt($ff70c770);