# HG changeset patch
# User nemo
# Date 1255701822 0
# Node ID 43f36aea1f55ec09b63e638d9706e7088bbd9285
# Parent  1e48275a52b6768b38eb14fe72792c5efc32a392
Kill flame if any gears collide.

diff -r 1e48275a52b6 -r 43f36aea1f55 hedgewars/uGears.pas
--- a/hedgewars/uGears.pas	Fri Oct 16 13:54:57 2009 +0000
+++ b/hedgewars/uGears.pas	Fri Oct 16 14:03:42 2009 +0000
@@ -1677,6 +1677,7 @@
 
 Damage:= modifyDamage(Damage);
 
+if (Ammo^.Kind = gtFlame) and (i > 0) then Ammo^.Health:= 0;
 while i > 0 do
 	begin
 	dec(i);
@@ -1691,7 +1692,6 @@
 			gtTarget,
 			gtCase: begin
 					if (Ammo^.Kind = gtDrill) then begin Ammo^.Timer:= 0; exit; end;
-                    if (Ammo^.Kind = gtFlame) then Ammo^.Health:= 0;
                     if (not Gear^.Invulnerable) then
                         ApplyDamage(Gear, Damage)
                     else