--- deliantra/server/socket/sounds.C	2006/12/14 20:39:55	1.9
+++ deliantra/server/socket/sounds.C	2007/01/15 01:39:42	1.12
@@ -26,7 +26,7 @@
 {
   char soundtype;
 
-  if (!pl->socket->sound)
+  if (!pl->ns->sound)
     return;
 
   /* Do some quick conversion to the sound type we want. */
@@ -46,33 +46,27 @@
      << uint16 (soundnum)
      << uint8  (soundtype);
 
-  pl->socket->send_packet (sl);
+  pl->ns->send_packet (sl);
 }
 
-#define POW2(x) ((x) * (x))
-
 /** Plays some sound on map at x,y.  */
 void
 play_sound_map (maptile *map, int x, int y, short sound_num)
 {
-  player *pl;
-
   if (sound_num >= NROF_SOUNDS)
     {
       LOG (llevError, "Tried to play an invalid sound num: %d\n", sound_num);
       return;
     }
 
-  for (pl = first_player; pl; pl = pl->next)
+  for_all_players (pl)
     {
       if (pl->ob->map == map)
         {
-          int distance = isqrt (POW2 (pl->ob->x - x) + POW2 (pl->ob->y - y));
+          int distance = idistance (pl->ob->x - x, 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));
-            }
+            play_sound_player_only (pl, sound_num, x - pl->ob->x, y - pl->ob->y);
         }
     }
 }