# HG changeset patch # User Wuzzy # Date 1564430319 -7200 # Node ID b12f63054c94f564ef1b0bb5856febaf98893b1c # Parent 7ab5cf40568614fa0bfc11935d1d136a59181cc6 No longer explode dying hogs that take damage diff -r 7ab5cf405686 -r b12f63054c94 ChangeLog.txt --- a/ChangeLog.txt Sun Jul 28 00:36:09 2019 +0200 +++ b/ChangeLog.txt Mon Jul 29 21:58:39 2019 +0200 @@ -39,7 +39,6 @@ * Add missing winner animation in single missions * Fix hog floating when switching to moving hog * Fix jump key not being ignored after placing girder or target - * Explode hog instantly when taking damage while dying * Fix buggy hog when hog took damage during "idle" phase in kamikaze attack Styles and schemes: diff -r 7ab5cf405686 -r b12f63054c94 hedgewars/uGearsUtils.pas --- a/hedgewars/uGearsUtils.pas Sun Jul 28 00:36:09 2019 +0200 +++ b/hedgewars/uGearsUtils.pas Mon Jul 29 21:58:39 2019 +0200 @@ -284,10 +284,7 @@ Gear^.Hedgehog^.Team^.Clan^.Flawless:= false; - if (Gear^.State and gstHHDeath) <> 0 then - // If hog took damage while dying, explode hog instantly (see doStepHedgehogDead) - Gear^.Timer:= 1 - else + if (Gear^.State and gstHHDeath) = 0 then begin HHHurt(Gear^.Hedgehog, Source, Damage); AddDamageTag(hwRound(Gear^.X), hwRound(Gear^.Y), Damage, Gear^.Hedgehog^.Team^.Clan^.Color);