equal
deleted
inserted
replaced
1604 if (not (CurrentTeam^.ExtDriven and isCursorVisible and (not bShowAmmoMenu))) and cHasFocus and (GameState <> gsConfirm) then |
1604 if (not (CurrentTeam^.ExtDriven and isCursorVisible and (not bShowAmmoMenu))) and cHasFocus and (GameState <> gsConfirm) then |
1605 uCursor.updatePosition(); |
1605 uCursor.updatePosition(); |
1606 {$ENDIF} |
1606 {$ENDIF} |
1607 z:= round(200/zoom); |
1607 z:= round(200/zoom); |
1608 if not PlacingHogs and (FollowGear <> nil) and (not isCursorVisible) and (not bShowAmmoMenu) and (not fastUntilLag) then |
1608 if not PlacingHogs and (FollowGear <> nil) and (not isCursorVisible) and (not bShowAmmoMenu) and (not fastUntilLag) then |
1609 if (not autoCameraOn) or ((abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y)) > 4) then |
1609 if (not autoCameraOn) then |
|
1610 FollowGear:= nil |
|
1611 else |
|
1612 if ((abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y)) > 4) then |
1610 begin |
1613 begin |
1611 FollowGear:= nil; |
1614 FollowGear:= nil; |
1612 prevPoint:= CursorPoint; |
1615 prevPoint:= CursorPoint; |
1613 exit |
1616 exit |
1614 end |
1617 end |
1654 end |
1657 end |
1655 else |
1658 else |
1656 EdgesDist:= cGearScrEdgesDist; |
1659 EdgesDist:= cGearScrEdgesDist; |
1657 |
1660 |
1658 // this generates the border around the screen that moves the camera when cursor is near it |
1661 // this generates the border around the screen that moves the camera when cursor is near it |
1659 if isCursorVisible or (FollowGear <> nil) then |
1662 if isCursorVisible or ((FollowGear <> nil) and autoCameraOn) then |
1660 begin |
1663 begin |
1661 if CursorPoint.X < - cScreenWidth div 2 + EdgesDist then |
1664 if CursorPoint.X < - cScreenWidth div 2 + EdgesDist then |
1662 begin |
1665 begin |
1663 WorldDx:= WorldDx - CursorPoint.X - cScreenWidth div 2 + EdgesDist; |
1666 WorldDx:= WorldDx - CursorPoint.X - cScreenWidth div 2 + EdgesDist; |
1664 CursorPoint.X:= - cScreenWidth div 2 + EdgesDist |
1667 CursorPoint.X:= - cScreenWidth div 2 + EdgesDist |