v0.11.0.9

Barotrauma/BarotraumaClient/ClientSource/Map/SubmarineBody.cs

@@ -10,10 +10,7 @@ namespace Barotrauma
         {
             if (GameMain.Client == null) { return; }
 
-            Vector2 newVelocity = Body.LinearVelocity;
-            Vector2 newPosition = Body.SimPosition;
-
-            Body.CorrectPosition(positionBuffer, out newPosition, out newVelocity, out _, out _);
+            Body.CorrectPosition(positionBuffer, out Vector2 newPosition, out Vector2 newVelocity, out _, out _);
             Vector2 moveAmount = ConvertUnits.ToDisplayUnits(newPosition - Body.SimPosition);
             newVelocity = newVelocity.ClampLength(100.0f);
             if (!MathUtils.IsValid(newVelocity) || moveAmount.LengthSquared() < 0.0001f)
@@ -24,12 +21,12 @@ namespace Barotrauma
             List<Submarine> subsToMove = submarine.GetConnectedSubs();
             foreach (Submarine dockedSub in subsToMove)
             {
-                if (dockedSub == submarine) continue;
+                if (dockedSub == submarine) { continue; }
                 //clear the position buffer of the docked subs to prevent unnecessary position corrections
                 dockedSub.SubBody.positionBuffer.Clear();
             }
 
-            Submarine closestSub = null;
+            Submarine closestSub;
             if (Character.Controlled == null)
             {
                 closestSub = Submarine.FindClosest(GameMain.GameScreen.Cam.Position);
@@ -63,5 +60,33 @@ namespace Barotrauma
                 if (Character.Controlled != null) Character.Controlled.CursorPosition += moveAmount;
             }
         }
+
+        private void PlayDamageSounds(Dictionary<Structure, float> damagedStructures, Vector2 impactSimPos, float impact, string soundTag)
+        {
+            if (impact < MinCollisionImpact) { return; }
+
+            //play a damage sound for the structure that took the most damage
+            float maxDamage = 0.0f;
+            Structure maxDamageStructure = null;
+            foreach (KeyValuePair<Structure, float> structureDamage in damagedStructures)
+            {
+                if (maxDamageStructure == null || structureDamage.Value > maxDamage)
+                {
+                    maxDamage = structureDamage.Value;
+                    maxDamageStructure = structureDamage.Key;
+                }
+            }
+
+            if (maxDamageStructure != null)
+            {
+                SoundPlayer.PlayDamageSound(
+                    soundTag,
+                    impact * 10.0f,
+                    ConvertUnits.ToDisplayUnits(impactSimPos),
+                    MathHelper.Lerp(2000.0f, 10000.0f, (impact - MinCollisionImpact) / 2.0f),
+                    maxDamageStructure.Tags);
+            }
+        }
+
     }
 }