# HG changeset patch # User unc0rr # Date 1301334257 -14400 # Node ID d0722d0b024dc00d8e3c0d1e3a6a09f856fc1374 # Parent e2d38329b84ac4e9613119654886a8118167f5ae - Use LastDamage in CheckHHDamage - Clear hedgehog's LastDamage when switching to him diff -r e2d38329b84a -r d0722d0b024d hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Mon Mar 28 21:27:06 2011 +0400 +++ b/hedgewars/GSHandlers.inc Mon Mar 28 21:44:17 2011 +0400 @@ -219,7 +219,10 @@ //else // PlaySound(sndOw1, Gear^.Hedgehog^.Team^.voicepack); - ApplyDamage(Gear, CurrentHedgehog, dmg, dsFall); + if Gear^.LastDamage <> nil then + ApplyDamage(Gear, Gear^.LastDamage, dmg, dsFall) + else + ApplyDamage(Gear, CurrentHedgehog, dmg, dsFall); end end; diff -r e2d38329b84a -r d0722d0b024d hedgewars/uGears.pas --- a/hedgewars/uGears.pas Mon Mar 28 21:27:06 2011 +0400 +++ b/hedgewars/uGears.pas Mon Mar 28 21:44:17 2011 +0400 @@ -1022,7 +1022,6 @@ if (Gear^.Kind = gtHedgehog) then begin - Gear^.LastDamage := AttackerHog; Gear^.Hedgehog^.Team^.Clan^.Flawless:= false; diff -r e2d38329b84a -r d0722d0b024d hedgewars/uTeams.pas --- a/hedgewars/uTeams.pas Mon Mar 28 21:27:06 2011 +0400 +++ b/hedgewars/uTeams.pas Mon Mar 28 21:44:17 2011 +0400 @@ -211,7 +211,8 @@ begin Z:= cCurrHHZ; State:= gstHHDriven; - Active:= true + Active:= true; + LastDamage:= nil end; RemoveGearFromList(Gear); InsertGearToList(Gear);