--- deliantra/server/socket/sounds.C	2007/08/01 00:26:05	1.21
+++ deliantra/server/socket/sounds.C	2012/11/09 16:27:55	1.33
@@ -1,24 +1,23 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
- * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
- * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ *
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 /* Send bug reports to Raphael Quinet (quinet@montefiore.ulg.ac.be) */
@@ -36,13 +35,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
   <
@@ -60,9 +52,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,8 +85,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])
     {
@@ -98,24 +97,18 @@
       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;
 
-      sl << uint8 (0) // group length
+      sl << uint8 (0) // group length, decoded as BER in clients
          << uint8 (0) // type == one-time effect
          << ber32 (sound)
          << sint8 (dx)
          << sint8 (dy)
          << uint8 (vol); // 0 == silent, 255 max
 
-      *len = sl.cur - len; // patch in group length
+      *len = sl.cur - len - 1; // patch in group length
 
       send_packet (sl);
     }