fix map sound distance

Author: pandinocoder

Intersect.Client.Core/Core/Sounds/MapSound.cs

@@ -3,6 +3,7 @@
 using Intersect.Client.Framework.GenericClasses;
 using Intersect.Client.General;
 using Intersect.Client.Maps;
+using Intersect.Config;
 
 namespace Intersect.Client.Core.Sounds;
 
@@ -18,6 +19,12 @@ public partial class MapSound : Sound, IMapSound
 
     private int mY;
 
+    private readonly MapOptions _mapOptions = Options.Instance.Map;
+    private readonly int _tileWidth;
+    private readonly int _tileHeight;
+    private readonly int _mapPixelWidth;
+    private readonly int _mapPixelHeight;
+
     public MapSound(
         string filename,
         int x,
@@ -40,6 +47,10 @@ public MapSound(
         mMapId = mapId;
         mEntity = parent;
         mSound.Volume = 0;
+        _tileWidth = _mapOptions.TileWidth;
+        _tileHeight = _mapOptions.TileHeight;
+        _mapPixelWidth = _mapOptions.MapWidth * _tileWidth;
+        _mapPixelHeight = _mapOptions.MapHeight * _tileHeight;
     }
 
     public void UpdatePosition(int x, int y, Guid mapId)
@@ -91,7 +102,7 @@ private void UpdateSoundVolume()
             var volume = 0f;
             if (mDistance > 0 && Globals.GridMaps.ContainsKey(mMapId))
             {
-                volume = 100 - 100 / ((mDistance + 1) * CalculateSoundDistance());
+                volume = 100 - 100f * CalculateSoundDistance() / (mDistance + 1);
                 if (volume < 0)
                 {
                     volume = 0f;
@@ -107,40 +118,56 @@ private void UpdateSoundVolume()
 
     private float CalculateSoundDistance()
     {
-        if (Globals.Me == null)
+        if (Globals.Me is not {} player)
+        {
+            return 0f;
+        }
+        var soundMapId = mMapId;
+        if (!MapInstance.TryGet(soundMapId, out var soundMap))
         {
             return 0f;
         }
 
-        var distance = 0f;
-        var map = MapInstance.Get(mMapId);
-        var pMap = MapInstance.Get(Globals.Me.MapId);
-        if (map != null && pMap != null)
+        MapInstance? playerMap;
+        var playerMapId = player.MapId;
+        if (playerMapId == soundMapId)
         {
-            var playerx = pMap.X + Globals.Me.X * Options.Instance.Map.TileWidth + (Options.Instance.Map.TileWidth / 2);
-            var playery = pMap.Y + Globals.Me.Y * Options.Instance.Map.TileHeight + (Options.Instance.Map.TileHeight / 2);
-            if (mX == -1 || mY == -1 || mDistance == -1)
-            {
-                var player = new Point() {
-                    X = (int)playerx,
-                    Y = (int)playery
-                };
-
-                var mapRect = new Rectangle(
-                    (int)map.X, (int)map.Y, Options.Instance.Map.MapWidth * Options.Instance.Map.TileWidth,
-                    Options.Instance.Map.MapHeight * Options.Instance.Map.TileHeight
-                );
-
-                distance = DistancePointToRectangle(player, mapRect) /
-                           ((Options.Instance.Map.TileHeight + Options.Instance.Map.TileWidth) / 2f);
-            }
-            else
-            {
-                var soundx = map.X + mX * Options.Instance.Map.TileWidth + (Options.Instance.Map.TileWidth / 2);
-                var soundy = map.Y + mY * Options.Instance.Map.TileHeight + (Options.Instance.Map.TileHeight / 2);
-                distance = (float) Math.Sqrt(Math.Pow(playerx - soundx, 2) + Math.Pow(playery - soundy, 2)) /
-                           ((Options.Instance.Map.TileHeight + Options.Instance.Map.TileWidth) / 2f);
-            }
+            playerMap = soundMap;
+        }
+        else if (!MapInstance.TryGet(playerMapId, out playerMap))
+        {
+            return 0f;
+        }
+
+        float distance;
+
+        Point playerPosition = new(
+            playerMap.X + player.X * _tileWidth + (_tileWidth / 2),
+            playerMap.Y + player.Y * _tileHeight + (_tileHeight / 2)
+        );
+
+        if (mX == -1 || mY == -1 || mDistance == -1)
+        {
+            var mapRect = new Rectangle(
+                soundMap.X,
+                soundMap.Y,
+                _mapPixelWidth,
+                _mapPixelHeight
+            );
+
+            distance = DistancePointToRectangle(playerPosition, mapRect) / ((_tileHeight + _tileWidth) / 2f);
+        }
+        else
+        {
+            Point soundPosition = new(
+                soundMap.X + mX * _tileWidth + (_tileWidth / 2),
+                soundMap.Y + mY * _tileHeight + (_tileHeight / 2)
+            );
+
+            var delta = playerPosition - soundPosition;
+
+            distance = (float)Math.Sqrt(Math.Pow(delta.X, 2) + Math.Pow(delta.Y, 2)) /
+                       ((_tileHeight + _tileWidth) / 2f);
         }
 
         return distance;