don't allow autocamera to mess with targetting when e.g. spamming air-attacks in inf attack mode
authorsheepluva
Fri, 06 Dec 2013 10:22:33 +0100
changeset 9755 6306b54dd8fc
parent 9754 12702ab1ba5f
child 9756 736abcc1915f
don't allow autocamera to mess with targetting when e.g. spamming air-attacks in inf attack mode
hedgewars/uWorld.pas
--- a/hedgewars/uWorld.pas	Fri Dec 06 09:30:07 2013 +0200
+++ b/hedgewars/uWorld.pas	Fri Dec 06 10:22:33 2013 +0100
@@ -1757,13 +1757,15 @@
 
 procedure MoveCamera;
 var EdgesDist, wdy, shs,z, amNumOffsetX, amNumOffsetY: LongInt;
+    inbtwnTrgtAttks: Boolean;
 begin
 {$IFNDEF MOBILE}
 if (not (CurrentTeam^.ExtDriven and isCursorVisible and (not bShowAmmoMenu) and autoCameraOn)) and cHasFocus and (GameState <> gsConfirm) then
     uCursor.updatePosition();
 {$ENDIF}
 z:= round(200/zoom);
-if not PlacingHogs and (FollowGear <> nil) and (not isCursorVisible) and (not bShowAmmoMenu) and (not fastUntilLag) and autoCameraOn then
+inbtwnTrgtAttks := (CurrentHedgehog <> nil) and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NeedTarget) <> 0) and ((GameFlags and gfInfAttack) <> 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
         FollowGear:= nil;