Mercurial Mercurial > hedgewars / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hedgewars/uGearsUtils.pas
changeset 12289 c20fbf96b853
parent 12209 7e6362c0ba96
child 12293 6383323fdd2c 
--- a/hedgewars/uGearsUtils.pas	Wed Apr 19 20:50:57 2017 +0200
+++ b/hedgewars/uGearsUtils.pas	Wed Apr 19 22:03:11 2017 +0200
@@ -304,15 +304,16 @@
                         end;
                     end
                 end;
-        if (GameFlags and gfKarma <> 0) and (GameFlags and gfInvulnerable = 0) and
-           (CurrentHedgehog^.Effects[heInvulnerable] = 0) then
-            begin // this cannot just use Damage or it interrupts shotgun and gets you called stupid
-            inc(CurrentHedgehog^.Gear^.Karma, tmpDmg);
-            CurrentHedgehog^.Gear^.LastDamage := CurrentHedgehog;
-            spawnHealthTagForHH(CurrentHedgehog^.Gear, tmpDmg);
+            if (GameFlags and gfKarma <> 0) and (GameFlags and gfInvulnerable = 0) and
+               (CurrentHedgehog^.Effects[heInvulnerable] = 0) then
+                begin // this cannot just use Damage or it interrupts shotgun and gets you called stupid
+                inc(CurrentHedgehog^.Gear^.Karma, tmpDmg);
+                CurrentHedgehog^.Gear^.LastDamage := CurrentHedgehog;
+                spawnHealthTagForHH(CurrentHedgehog^.Gear, tmpDmg);
+                end;
             end;
+
         uStats.HedgehogDamaged(Gear, AttackerHog, Damage, false);
-        end;
 
 	if AprilOne and (Gear^.Hedgehog^.Hat = 'fr_tomato') and (Damage > 2) then
 	    for i := 0 to random(min(Damage,20))+5 do
hedgewars