(ff4df7194) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev

2019-05-16 06:24:39 +03:00
parent 880b7b1c02
commit dc2f96443a
14 changed files with 366 additions and 142 deletions
@@ -495,10 +495,10 @@ namespace Barotrauma.Items.Components

            character.CursorPosition = closestEnemy.WorldPosition;
            if (item.Submarine != null) character.CursorPosition -= item.Submarine.Position;
-            if (item.RequireAimToUse)
-            {
-                character.SetInput(InputType.Aim, false, true);
-            }
+
+            //force aim input even if the turret doesn't require it,
+            //because the cursor position (and consequently, turret aim direction) is only synced to clients when aiming
+            character.SetInput(InputType.Aim, false, true);

            float enemyAngle = MathUtils.VectorToAngle(closestEnemy.WorldPosition - item.WorldPosition);
            float turretAngle = -rotation;