# HG changeset patch # User nemo # Date 1245598867 0 # Node ID 6c5a339f8e283025af8cf107839758fdc5ce33c6 # Parent 839472821b4d006fc5c307d95e1c28e2be1b04ae Use different group to not erase messages, restore gear deletion on hog damage. diff -r 839472821b4d -r 6c5a339f8e28 hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Sun Jun 21 15:36:50 2009 +0000 +++ b/hedgewars/GSHandlers.inc Sun Jun 21 15:41:07 2009 +0000 @@ -2212,7 +2212,7 @@ dec(Gear^.Health, fuel div 5) end; if Gear^.Health < 0 then Gear^.Health:= 0; -if (GameTicks and $3F) = 0 then AddCaption('Fuel: '+inttostr(round(Gear^.Health/20))+'%', $FFFFFF, capgrpMessage); +if (GameTicks and $3F) = 0 then AddCaption('Fuel: '+inttostr(round(Gear^.Health/20))+'%', $FFFFFF, capgrpAmmostate); //AddCaption(inttostr(round(Gear^.Health/20))+'% : '+inttostr(round(Gear^.Timer/1000)), $FFFFFF, capgrpMessage); @@ -2224,6 +2224,7 @@ doStepHedgehogMoving(HHGear); if (Gear^.Health = 0) + or (HHGear^.Damage <> 0) or CheckGearDrowning(HHGear) or ((Gear^.Message and gm_Attack) <> 0) then begin diff -r 839472821b4d -r 6c5a339f8e28 hedgewars/uConsts.pas --- a/hedgewars/uConsts.pas Sun Jun 21 15:36:50 2009 +0000 +++ b/hedgewars/uConsts.pas Sun Jun 21 15:41:07 2009 +0000 @@ -105,7 +105,7 @@ THWFont = (fnt16, fntBig, fntSmall); TCapGroup = (capgrpGameState, capgrpAmmoinfo, capgrpVolume, - capgrpMessage); + capgrpMessage, capgrpAmmostate); TStatInfoType = (siGameResult, siMaxStepDamage, siMaxStepKills, siKilledHHs, siClanHealth);