Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
authornemo
Wed, 27 Oct 2010 00:24:03 -0400
changeset 4002 3e173ac63849
parent 3997 6baa46aad645 (diff)
parent 4001 cfd83b04e0be (current diff)
child 4004 b1c2c2f6fc5e
child 4005 3a42cd3cc27f
merge
hedgewars/uGears.pas file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Basketball.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/credits.plist file | annotate | diff | comparison | revisions 
--- 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;
sheepy-clone