--- a/hedgewars/GSHandlers.inc	Mon Oct 10 15:45:19 2011 -0400
+++ b/hedgewars/GSHandlers.inc	Mon Oct 10 16:23:08 2011 -0400
@@ -1930,7 +1930,7 @@
             dec(Gear^.Timer);
             end
     else // gsttmpFlag = 0
-        if (TurnTimeLeft = 0) or ((GameFlags and gfInfAttack) <> 0) then Gear^.State := Gear^.State or gsttmpFlag;
+        if (TurnTimeLeft = 0) or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime + 1000)) then Gear^.State := Gear^.State or gsttmpFlag;
 end;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1977,7 +1977,7 @@
         end
     end
     else // gsttmpFlag = 0
-        if TurnTimeLeft = 0 then Gear^.State := Gear^.State or gsttmpFlag;
+        if (TurnTimeLeft = 0) or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime + 1000))  then Gear^.State := Gear^.State or gsttmpFlag;
 end;
 
 ////////////////////////////////////////////////////////////////////////////////

--- a/hedgewars/HHHandlers.inc	Mon Oct 10 15:45:19 2011 -0400
+++ b/hedgewars/HHHandlers.inc	Mon Oct 10 16:23:08 2011 -0400
@@ -373,6 +373,7 @@
                   amResurrector, amStructure,
                        amTardis: CurAmmoGear:= newGear;
                   end;
+              if (CurAmmoType = amMine) or (CurAmmoType = amSMine) and (GameFlags and gfInfAttack <> 0) then newGear^.FlightTime:= GameTicks;
         if Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NeedTarget <> 0 then
             begin
             newGear^.Target.X:= TargetPoint.X;