Mercurial Mercurial > hedgewars / 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.
oups
authornemo
Tue, 05 Mar 2013 20:28:33 -0500
changeset 8658 e7df553193ba
parent 8656 a8282143a8df
child 8663 25b35de44234
oups
hedgewars/uGearsHedgehog.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/uGearsHedgehog.pas	Tue Mar 05 19:37:48 2013 -0500
+++ b/hedgewars/uGearsHedgehog.pas	Tue Mar 05 20:28:33 2013 -0500
@@ -1010,13 +1010,10 @@
     Hedgehog: PHedgehog;
 begin
 Hedgehog:= HHGear^.Hedgehog;
-//if isInMultiShoot and not AllInactive and (Hedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle]) then HHGear^.Message:= HHGear^.Message and not gmAttack;
-if isInMultiShoot and (Hedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle]) then
-    begin
-    AllInactive:= true;
-    HHGear^.Message:= 0
-    end
-else AllInactive:= false;
+if not isInMultiShoot then
+    AllInactive:= false
+else if Hedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle] then
+    HHGear^.Message:= 0;
 
 if (TurnTimeLeft = 0) or (HHGear^.Damage > 0) then
     begin
hedgewars