# HG changeset patch # User Wuzzy # Date 1537343145 -7200 # Node ID 5d46b4fae757af4de136c6e1f3f3627e59d3f104 # Parent 096cc009e0b8d76845bfbb7759127ef8f456def7 Ignore gmTimer after attack or hog is no longer controlled You were able to set the timer after you threw a grenade diff -r 096cc009e0b8 -r 5d46b4fae757 hedgewars/uGearsHedgehog.pas --- a/hedgewars/uGearsHedgehog.pas Wed Sep 19 09:31:06 2018 +0200 +++ b/hedgewars/uGearsHedgehog.pas Wed Sep 19 09:45:45 2018 +0200 @@ -186,6 +186,9 @@ Gear^.Message:= Gear^.Message and (not gmTimer); CurWeapon:= GetCurAmmoEntry(Gear^.Hedgehog^); with Gear^.Hedgehog^ do + if (((Gear^.State and gstAttacked) <> 0) and (GameFlags and gfInfAttack = 0)) + or ((Gear^.State and gstHHDriven) = 0) then + exit; if ((Gear^.Message and gmPrecise) <> 0) and ((CurWeapon^.Propz and ammoprop_SetBounce) <> 0) then begin color:= Gear^.Hedgehog^.Team^.Clan^.Color;