--- deliantra/server/socket/sounds.C	2007/08/01 01:07:42	1.22
+++ deliantra/server/socket/sounds.C	2007/08/01 01:53:13	1.23
@@ -36,13 +36,6 @@
 
 #include <tr1/unordered_map>
 
-/**
- * Maximum distance a player may hear a sound from.
- * This is only used for new client/server sound.  If the sound source
- * on the map is farther away than this, we don't sent it to the client.
- */
-#define MAX_SOUND_DISTANCE 16
-
 // the hashtable
 typedef std::tr1::unordered_map
   <
@@ -93,8 +86,11 @@
   if (!sound)
     return;
 
-  if (dx < -MAX_SOUND_DISTANCE || dx > MAX_SOUND_DISTANCE) return;
-  if (dy < -MAX_SOUND_DISTANCE || dy > MAX_SOUND_DISTANCE) return;
+  uint8 vol = 255 - idistance (dx, dy) * 255 / MAX_SOUND_DISTANCE;
+
+  // cut off volume here
+  if (vol <= 0)
+    return;
 
   if (fx_want [FT_SOUND])
     {
@@ -102,12 +98,6 @@
       send_face (sound);
       flush_fx ();
 
-      uint8 vol = clamp (255 - idistance (dx, dy) * 361 / MAX_SOUND_DISTANCE, 0, 255);
-
-      // cut off volume here
-      if (vol < 8)
-        return;
-
       packet sl ("sc");
 
       uint8 *len = sl.cur;