--- deliantra/server/socket/sounds.C 2006/12/13 21:27:09 1.6 +++ deliantra/server/socket/sounds.C 2006/12/23 13:56:25 1.11 @@ -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. */ @@ -38,7 +38,7 @@ else soundtype = SOUND_NORMAL; - SockList sl (MAXSOCKBUF); + packet sl; sl << "sound " << uint8 (x) @@ -46,8 +46,7 @@ << uint16 (soundnum) << uint8 (soundtype); - Send_With_Handling (&pl->socket, &sl); - sl.free (); + pl->ns->send_packet (sl); } #define POW2(x) ((x) * (x)) @@ -56,15 +55,13 @@ 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) {