Mercurial Mercurial > hedgewars-draft / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Suppress "X remaining" caption in multishoot with gfMultiWeapon
authorWuzzy <Wuzzy2@mail.ru>
Tue, 07 Aug 2018 01:28:19 +0200
changeset 13619 525686876f98
parent 13618 edffc9b7ad58
child 13620 211a37eb6a29
Suppress "X remaining" caption in multishoot with gfMultiWeapon
hedgewars/uGearsHedgehog.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/uGearsHedgehog.pas	Tue Aug 07 01:24:57 2018 +0200
+++ b/hedgewars/uGearsHedgehog.pas	Tue Aug 07 01:28:19 2018 +0200
@@ -618,7 +618,7 @@
         begin
         Inc(MultiShootAttacks);
 
-        if (Ammoz[a].Ammo.NumPerTurn >= MultiShootAttacks) then
+        if (Ammoz[a].Ammo.NumPerTurn >= MultiShootAttacks) and ((GameFlags and gfMultiWeapon) = 0) then
             begin
             s:= ansistring(inttostr(Ammoz[a].Ammo.NumPerTurn - MultiShootAttacks + 1));
             AddCaption(formatA(trmsg[sidRemaining], s), cWhiteColor, capgrpAmmostate);
hedgewars-draft