--- deliantra/server/socket/sounds.C	2007/07/01 05:00:21	1.14
+++ deliantra/server/socket/sounds.C	2007/07/31 01:06:20	1.19
@@ -34,6 +34,8 @@
 #include <sproto.h>
 #include <sounds.h>
 
+#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
@@ -41,55 +43,99 @@
  */
 #define MAX_SOUND_DISTANCE 10
 
-/**
+// the hashtable
+typedef std::tr1::unordered_map
+  <
+    const char *,
+    faceidx,
+    str_hash,
+    str_equal,
+    slice_allocator< std::pair<const char *const, faceidx> >
+  > HT;
+
+static HT ht;
+
+faceidx
+sound_find (const char *str)
+{
+  auto (i, ht.find (str));
+
+  return i == ht.end ()
+    ? 0
+    : i->second;
+}
+
+void
+sound_set (const char *str, faceidx face)
+{
+  auto (i, ht.find (str));
+
+  if (i != ht.end ())
+    i->second = face;
+  else
+    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
  */
 void
-play_sound_player_only (player *pl, short soundnum, sint8 x, sint8 y)
+client::play_sound (faceidx sound, int dx, int dy)
 {
-  char soundtype;
-
-  if (!pl->ns->sound)
+  if (!sound)
     return;
 
-  /* Do some quick conversion to the sound type we want. */
-  if (soundnum >= SOUND_CAST_SPELL_0)
+  if (fx_want [FT_SOUND])
     {
-      soundtype = SOUND_SPELL;
-      soundnum -= SOUND_CAST_SPELL_0;
-    }
-  else
-    soundtype = SOUND_NORMAL;
+      // cfplus
+      send_face (sound);
+      flush_fx ();
 
-  packet sl;
+      uint8 vol = clamp (255 - idistance (dx, dy) * 255 / 10, 0, 255);
 
-  sl << "sound "
-     << uint8  (x)
-     << uint8  (y)
-     << uint16 (soundnum)
-     << uint8  (soundtype);
+      // cut off volume here
+      if (vol < 16)
+        return;
 
-  pl->ns->send_packet (sl);
-}
+      packet sl ("sc");
 
-/** Plays some sound on map at x,y.  */
-void
-play_sound_map (maptile *map, int x, int y, short sound_num)
-{
-  if (sound_num >= NROF_SOUNDS)
-    {
-      LOG (llevError, "Tried to play an invalid sound num: %d\n", sound_num);
-      return;
-    }
+      uint8 *len = sl.cur;
 
-  for_all_players (pl)
+      sl << uint8 (0) // group length
+         << 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
+
+      send_packet (sl);
+    }
+  else if (this->sound)
     {
-      if (pl->ob->map == map)
-        {
-          int distance = idistance (pl->ob->x - x, pl->ob->y - y);
-
-          if (distance <= MAX_SOUND_DISTANCE)
-            play_sound_player_only (pl, sound_num, x - pl->ob->x, y - pl->ob->y);
-        }
+      //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;
+          }
     }
 }
+