--- a/hedgewars/GSHandlers.inc	Mon Jul 31 11:31:31 2006 +0000
+++ b/hedgewars/GSHandlers.inc	Sat Aug 05 20:57:36 2006 +0000
@@ -179,7 +179,7 @@
 end;
 
 ////////////////////////////////////////////////////////////////////////////////
-procedure doStepHealthTag(Gear: PGear);
+procedure doStepHealthTagWork(Gear: PGear);
 begin
 AllInactive:= false;
 dec(Gear.Timer);
@@ -191,6 +191,15 @@
    end
 end;
 
+procedure doStepHealthTag(Gear: PGear);
+var s: shortstring;
+begin
+AllInactive:= false;
+str(Gear.State, s);
+Gear.Surf:= RenderString(s, PHedgehog(Gear.Hedgehog).Team.Color, fnt16);
+Gear.doStep:= doStepHealthTagWork
+end;
+
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepGrave(Gear: PGear);
 begin
@@ -264,7 +273,7 @@
 if Gear.Timer > 0 then
    begin
    dec(Gear.Timer);
-   if Gear.Timer = 1 then PlaySound(sndShotgunFire);
+   if Gear.Timer = 0 then PlaySound(sndShotgunFire);
    exit
    end;
 i:= 200;
@@ -283,7 +292,10 @@
 dec(i)
 until i = 0;
 if (Gear.X < 0) or (Gear.Y < 0) or (Gear.X > 2048) or (Gear.Y > 1024) then
-   DeleteGear(Gear)
+   begin
+   DeleteGear(Gear);
+   AfterAttack
+   end
 end;
 
 ////////////////////////////////////////////////////////////////////////////////