--- deliantra/server/socket/sounds.C	2007/07/26 00:27:09	1.15
+++ deliantra/server/socket/sounds.C	2008/05/06 16:55:26	1.26
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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
+ * Deliantra 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.
@@ -18,7 +18,7 @@
  * 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>
+ * 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 +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
@@ -76,6 +73,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,20 +86,13 @@
   if (!sound)
     return;
 
-  if (this->sound)
-    {
-      // gcfclient compatibility
-
-      packet sl ("sound");
+  uint8 vol = 255 - idistance (dx, dy) * 255 / MAX_SOUND_DISTANCE;
 
-      sl << uint8  (dx)
-         << uint8  (dy)
-         << uint16 (sound)
-         << uint8  (SOUND_NORMAL);
+  // cut off volume here
+  if (vol <= 0)
+    return;
 
-      send_packet (sl);
-    }
-  else if (fx_want [FT_SOUND])
+  if (fx_want [FT_SOUND])
     {
       // cfplus
       send_face (sound);
@@ -112,11 +106,33 @@
          << 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
 
       send_packet (sl);
     }
+  else if (this->sound)
+    {
+      //TODO: remove, or make bearable
+      // gcfclient compatibility
+
+      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);
+
+            send_packet (sl);
+
+            break;
+          }
+    }
 }