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.
blowtorch defrosts too
authornemo
Mon, 03 Jun 2013 23:59:55 -0400
changeset 9103 b70352db5675
parent 9100 3f5e0280db4d
child 9105 18ebb59c89fe
blowtorch defrosts too
hedgewars/uGears.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/uGears.pas	Tue Jun 04 00:15:03 2013 +0400
+++ b/hedgewars/uGears.pas	Mon Jun 03 23:59:55 2013 -0400
@@ -774,7 +774,8 @@
     begin
     dec(i);
     Gear:= t^.ar[i];
-    if (Ammo^.Kind = gtFlame) and (Gear^.Kind = gtHedgehog) and (Gear^.Hedgehog^.Effects[heFrozen] > 255) then
+    if ((Ammo^.Kind = gtFlame) or (Ammo^.Kind = gtBlowTorch)) and 
+       (Gear^.Kind = gtHedgehog) and (Gear^.Hedgehog^.Effects[heFrozen] > 255) then
         Gear^.Hedgehog^.Effects[heFrozen]:= max(255,Gear^.Hedgehog^.Effects[heFrozen]-10000);
     tmpDmg:= ModifyDamage(Damage, Gear);
     if (Gear^.State and gstNoDamage) = 0 then
hedgewars