# HG changeset patch # User Wuzzy # Date 1521305262 -3600 # Node ID 0171519e2f13583a223c0d5e86fd80e448cb7705 # Parent ef1393c6bd12edeb52c6da8366c18f90b44e3bf8 Show sidNoEndTurn text for most weapons when in inf attack mode diff -r ef1393c6bd12 -r 0171519e2f13 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);