--- deliantra/server/socket/sounds.C	2007/07/28 00:45:05	1.18
+++ deliantra/server/socket/sounds.C	2007/09/07 17:39:17	1.24
@@ -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 10
-
 // the hashtable
 typedef std::tr1::unordered_map
   <
@@ -60,9 +53,13 @@
 {
   auto (i, ht.find (str));
 
-  return i == ht.end ()
-    ? 0
-    : i->second;
+  if (i != ht.end ())
+    return i->second;
+
+  if (strncmp (str, "sound/", sizeof ("sound/") - 1))
+    str = format ("sound/%s", str);
+
+  return face_find (str);
 }
 
 void
@@ -89,18 +86,18 @@
   if (!sound)
     return;
 
+  uint8 vol = 255 - idistance (dx, dy) * 255 / MAX_SOUND_DISTANCE;
+
+  // cut off volume here
+  if (vol <= 0)
+    return;
+
   if (fx_want [FT_SOUND])
     {
       // cfplus
       send_face (sound);
       flush_fx ();
 
-      sint8 vol = idistance (dx, dy) * -80 / 10;
-
-      // cut off volume here
-      if (vol < -80)
-        return;
-
       packet sl ("sc");
 
       uint8 *len = sl.cur;
@@ -110,7 +107,7 @@
          << ber32 (sound)
          << sint8 (dx)
          << sint8 (dy)
-         << sint8 (vol); // -128 == silent, 0 normal, 127 twice the amplitude
+         << uint8 (vol); // 0 == silent, 255 max
 
       *len = sl.cur - len; // patch in group length