--- deliantra/server/socket/sounds.C	2007/07/26 00:38:34	1.16
+++ deliantra/server/socket/sounds.C	2007/08/01 00:26:05	1.21
@@ -41,7 +41,7 @@
  * 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 10
+#define MAX_SOUND_DISTANCE 16
 
 // the hashtable
 typedef std::tr1::unordered_map
@@ -76,6 +76,10 @@
     ht.insert (std::make_pair (strdup (str), face));
 }
 
+//TODO: remove
+// for gcfclient-compatibility, to vanish at some point
+faceidx old_sound_index [SOUND_CAST_SPELL_0];
+
 /*
  * Plays a sound for specified player only
  */
@@ -85,12 +89,21 @@
   if (!sound)
     return;
 
+  if (dx < -MAX_SOUND_DISTANCE || dx > MAX_SOUND_DISTANCE) return;
+  if (dy < -MAX_SOUND_DISTANCE || dy > MAX_SOUND_DISTANCE) return;
+
   if (fx_want [FT_SOUND])
     {
       // cfplus
       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;
@@ -99,7 +112,8 @@
          << uint8 (0) // type == one-time effect
          << ber32 (sound)
          << sint8 (dx)
-         << sint8 (dy);
+         << sint8 (dy)
+         << uint8 (vol); // 0 == silent, 255 max
 
       *len = sl.cur - len; // patch in group length
 
@@ -107,17 +121,24 @@
     }
   else if (this->sound)
     {
+      //TODO: remove, or make bearable
       // gcfclient compatibility
-      // fetch compatibility sound index first
 
-      packet sl ("sound");
+      int gcfclient_sound;
+      for (gcfclient_sound = SOUND_CAST_SPELL_0; gcfclient_sound--; )
+        if (old_sound_index [gcfclient_sound] == sound)
+          {
+            packet sl ("sound");
+
+            sl << uint8  (dx)
+               << uint8  (dy)
+               << uint16 (gcfclient_sound)
+               << uint8  (SOUND_NORMAL);
 
-      sl << uint8  (dx)
-         << uint8  (dy)
-         << uint16 (sound)
-         << uint8  (SOUND_NORMAL);
+            send_packet (sl);
 
-      send_packet (sl);
+            break;
+          }
     }
 }