--- deliantra/server/socket/sounds.C	2007/07/31 01:06:20	1.19
+++ deliantra/server/socket/sounds.C	2007/08/01 01:07:42	1.22
@@ -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
@@ -60,9 +60,13 @@
 {
   auto (i, ht.find (str));
 
-  return i == ht.end ()
-    ? 0
-    : i->second;
+  if (i != ht.end ())
+    return i->second;
+
+  //TODO: really fall back to face name?
+  char face[128];
+  snprintf (face, 128, "sound/%s", str);
+  return face_find (face);
 }
 
 void
@@ -89,16 +93,19 @@
   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) * 255 / 10, 0, 255);
+      uint8 vol = clamp (255 - idistance (dx, dy) * 361 / MAX_SOUND_DISTANCE, 0, 255);
 
       // cut off volume here
-      if (vol < 16)
+      if (vol < 8)
         return;
 
       packet sl ("sc");