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
authorkoda
Fri, 29 Oct 2010 00:25:18 +0200
changeset 4007 c76c895825ab
parent 4003 ca0600ab38bf (current diff)
parent 4005 3a42cd3cc27f (diff)
child 4008 d87619de120d
merge
hedgewars/uGears.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/GSHandlers.inc	Fri Oct 29 00:24:17 2010 +0200
+++ b/hedgewars/GSHandlers.inc	Fri Oct 29 00:25:18 2010 +0200
@@ -3051,7 +3051,7 @@
     Gear^.X := HHGear^.X;
     Gear^.Y := HHGear^.Y;
     // For some reason I need to reapply followgear here, something else grabs it otherwise.
-    if not bShowAmmoMenu then FollowGear := HHGear;
+    if not bShowAmmoMenu and not CurrentTeam^.ExtDriven then FollowGear := HHGear;
 
     if ((Gear^.State and gsttmpFlag) = 0) or (HHGear^.dY < _0) then doStepHedgehogMoving(HHGear);
 
--- a/hedgewars/uGears.pas	Fri Oct 29 00:24:17 2010 +0200
+++ b/hedgewars/uGears.pas	Fri Oct 29 00:25:18 2010 +0200
@@ -1307,7 +1307,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