# HG changeset patch # User Wuzzy # Date 1533599269 -7200 # Node ID 358ccb060cb3d65f7ed966120e077d2495ec935a # Parent 0c797469d16ddc087af6f0a9d361fe5c40f98d7f Backed out changeset 0c797469d16d diff -r 0c797469d16d -r 358ccb060cb3 hedgewars/uWorld.pas --- a/hedgewars/uWorld.pas Tue Aug 07 01:43:22 2018 +0200 +++ b/hedgewars/uWorld.pas Tue Aug 07 01:47:49 2018 +0200 @@ -1802,7 +1802,7 @@ uCursor.updatePosition(); {$ENDIF} z:= round(200/zoom); -inbtwnTrgtAttks := ((GameFlags and (gfInfAttack or gfMultiWeapon)) <> 0) and (CurrentHedgehog <> nil) and ((CurrentHedgehog^.Gear = nil) or (CurrentHedgehog^.Gear <> FollowGear)) and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NeedTarget) <> 0); +inbtwnTrgtAttks := ((GameFlags and gfInfAttack) <> 0) and (CurrentHedgehog <> nil) and ((CurrentHedgehog^.Gear = nil) or (CurrentHedgehog^.Gear <> FollowGear)) and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NeedTarget) <> 0); if autoCameraOn and (not PlacingHogs) and (FollowGear <> nil) and (not isCursorVisible) and (not bShowAmmoMenu) and (not fastUntilLag) and (not inbtwnTrgtAttks) then if ((abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y)) > 4) then begin