# HG changeset patch
# User nemo
# Date 1288153443 14400
# Node ID 3e173ac6384913b460bf537fa91109b15f49a044
# Parent  6baa46aad64560620d083d3c4f09647489253cb3# Parent  cfd83b04e0beefe428053de68da6cd02129438d9
merge

diff -r cfd83b04e0be -r 3e173ac63849 hedgewars/uGears.pas
--- a/hedgewars/uGears.pas	Wed Oct 27 01:33:38 2010 +0200
+++ b/hedgewars/uGears.pas	Wed Oct 27 00:24:03 2010 -0400
@@ -1308,7 +1308,7 @@
                                 if not Gear^.Invulnerable then
                                     Gear^.State:= (Gear^.State or gstMoving) and (not gstWinner);
                                 Gear^.Active:= true;
-                                FollowGear:= Gear
+                                if Gear^.Kind <> gtFlame then FollowGear:= Gear
                                 end;
                             if ((Mask and EXPLPoisoned) <> 0) and (Gear^.Kind = gtHedgehog) then
                                 PHedgehog(Gear^.Hedgehog)^.Effects[hePoisoned] := true;