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

2019-04-16 17:12:09 +03:00
parent bd07acf26d
commit 6262b3ea54
96 changed files with 1972 additions and 825 deletions
@@ -39,25 +39,33 @@ namespace Barotrauma.Networking

        public void UpdateSoundPosition()
        {
-            if (VoipSound != null)
+            if (VoipSound == null) { return; }
+            
+            if (!VoipSound.IsPlaying)
            {
-                if (!VoipSound.IsPlaying)
-                {
-                    DebugConsole.Log("Destroying voipsound");
-                    VoipSound.Dispose();
-                    VoipSound = null;
-                    return;
-                }
+                DebugConsole.Log("Destroying voipsound");
+                VoipSound.Dispose();
+                VoipSound = null;
+                return;
+            }

-                if (character != null)
+            if (character != null)
+            {
+                if (GameMain.Config.UseDirectionalVoiceChat)
                {
                    VoipSound.SetPosition(new Vector3(character.WorldPosition.X, character.WorldPosition.Y, 0.0f));
                }
                else
                {
                    VoipSound.SetPosition(null);
+                    float dist = Vector3.Distance(new Vector3(character.WorldPosition, 0.0f), GameMain.SoundManager.ListenerPosition);
+                    VoipSound.Gain = 1.0f - MathUtils.InverseLerp(VoipSound.Near, VoipSound.Far, dist);
                }
            }
+            else
+            {
+                VoipSound.SetPosition(null);
+            }            
        }

        partial void InitProjSpecific()