--- deliantra/server/socket/sounds.C	2006/09/14 22:34:06	1.4
+++ deliantra/server/socket/sounds.C	2007/07/26 00:27:09	1.15
@@ -1,3 +1,26 @@
+/*
+ * 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 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>
+ */
+
 /* Send bug reports to Raphael Quinet (quinet@montefiore.ulg.ac.be) */
 
 /**
@@ -11,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
@@ -18,61 +43,80 @@
  */
 #define MAX_SOUND_DISTANCE 10
 
-/**
- * Plays a sound for specified player only
- */
+// 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
-play_sound_player_only (player *pl, short soundnum, sint8 x, sint8 y)
+sound_set (const char *str, faceidx face)
 {
-  char soundtype;
-  SockList sl;
+  auto (i, ht.find (str));
 
-  if (!pl->socket.sound)
-    return;
-  /* Do some quick conversion to the sound type we want. */
-  if (soundnum >= SOUND_CAST_SPELL_0)
-    {
-      soundtype = SOUND_SPELL;
-      soundnum -= SOUND_CAST_SPELL_0;
-    }
+  if (i != ht.end ())
+    i->second = face;
   else
-    soundtype = SOUND_NORMAL;
-
-  sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
-  strcpy ((char *) sl.buf, "sound ");
-  sl.len = strlen ((char *) sl.buf);
-  SockList_AddChar (&sl, x);
-  SockList_AddChar (&sl, y);
-  SockList_AddShort (&sl, soundnum);
-  SockList_AddChar (&sl, soundtype);
-  Send_With_Handling (&pl->socket, &sl);
-  free (sl.buf);
+    ht.insert (std::make_pair (strdup (str), face));
 }
 
-#define POW2(x) ((x) * (x))
-
-/** Plays some sound on map at x,y.  */
+/*
+ * Plays a sound for specified player only
+ */
 void
-play_sound_map (mapstruct *map, int x, int y, short sound_num)
+client::play_sound (faceidx sound, int dx, int dy)
 {
-  player *pl;
+  if (!sound)
+    return;
 
-  if (sound_num >= NROF_SOUNDS)
+  if (this->sound)
     {
-      LOG (llevError, "Tried to play an invalid sound num: %d\n", sound_num);
-      return;
-    }
+      // gcfclient compatibility
+
+      packet sl ("sound");
+
+      sl << uint8  (dx)
+         << uint8  (dy)
+         << uint16 (sound)
+         << uint8  (SOUND_NORMAL);
 
-  for (pl = first_player; pl; pl = pl->next)
+      send_packet (sl);
+    }
+  else if (fx_want [FT_SOUND])
     {
-      if (pl->ob->map == map)
-        {
-          int distance = isqrt (POW2 (pl->ob->x - x) + POW2 (pl->ob->y - y));
-
-          if (distance <= MAX_SOUND_DISTANCE)
-            {
-              play_sound_player_only (pl, sound_num, (sint8) (x - pl->ob->x), (sint8) (y - pl->ob->y));
-            }
-        }
+      // cfplus
+      send_face (sound);
+      flush_fx ();
+
+      packet sl ("sc");
+
+      uint8 *len = sl.cur;
+
+      sl << uint8 (0) // group length
+         << uint8 (0) // type == one-time effect
+         << ber32 (sound)
+         << sint8 (dx)
+         << sint8 (dy);
+
+      *len = sl.cur - len; // patch in group length
+
+      send_packet (sl);
     }
 }
+