ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/sounds.C
(Generate patch)

Comparing deliantra/server/socket/sounds.C (file contents):
Revision 1.6 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.14 by root, Sun Jul 1 05:00:21 2007 UTC

1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22 */
23
1/* Send bug reports to Raphael Quinet (quinet@montefiore.ulg.ac.be) */ 24/* Send bug reports to Raphael Quinet (quinet@montefiore.ulg.ac.be) */
2 25
3/** 26/**
4 * \file 27 * \file
5 * Sound-related functions. 28 * Sound-related functions.
24void 47void
25play_sound_player_only (player *pl, short soundnum, sint8 x, sint8 y) 48play_sound_player_only (player *pl, short soundnum, sint8 x, sint8 y)
26{ 49{
27 char soundtype; 50 char soundtype;
28 51
29 if (!pl->socket.sound) 52 if (!pl->ns->sound)
30 return; 53 return;
31 54
32 /* Do some quick conversion to the sound type we want. */ 55 /* Do some quick conversion to the sound type we want. */
33 if (soundnum >= SOUND_CAST_SPELL_0) 56 if (soundnum >= SOUND_CAST_SPELL_0)
34 { 57 {
36 soundnum -= SOUND_CAST_SPELL_0; 59 soundnum -= SOUND_CAST_SPELL_0;
37 } 60 }
38 else 61 else
39 soundtype = SOUND_NORMAL; 62 soundtype = SOUND_NORMAL;
40 63
41 SockList sl (MAXSOCKBUF); 64 packet sl;
42 65
43 sl << "sound " 66 sl << "sound "
44 << uint8 (x) 67 << uint8 (x)
45 << uint8 (y) 68 << uint8 (y)
46 << uint16 (soundnum) 69 << uint16 (soundnum)
47 << uint8 (soundtype); 70 << uint8 (soundtype);
48 71
49 Send_With_Handling (&pl->socket, &sl); 72 pl->ns->send_packet (sl);
50 sl.free ();
51} 73}
52
53#define POW2(x) ((x) * (x))
54 74
55/** Plays some sound on map at x,y. */ 75/** Plays some sound on map at x,y. */
56void 76void
57play_sound_map (maptile *map, int x, int y, short sound_num) 77play_sound_map (maptile *map, int x, int y, short sound_num)
58{ 78{
59 player *pl;
60
61 if (sound_num >= NROF_SOUNDS) 79 if (sound_num >= NROF_SOUNDS)
62 { 80 {
63 LOG (llevError, "Tried to play an invalid sound num: %d\n", sound_num); 81 LOG (llevError, "Tried to play an invalid sound num: %d\n", sound_num);
64 return; 82 return;
65 } 83 }
66 84
67 for (pl = first_player; pl; pl = pl->next) 85 for_all_players (pl)
68 { 86 {
69 if (pl->ob->map == map) 87 if (pl->ob->map == map)
70 { 88 {
71 int distance = isqrt (POW2 (pl->ob->x - x) + POW2 (pl->ob->y - y)); 89 int distance = idistance (pl->ob->x - x, pl->ob->y - y);
72 90
73 if (distance <= MAX_SOUND_DISTANCE) 91 if (distance <= MAX_SOUND_DISTANCE)
74 {
75 play_sound_player_only (pl, sound_num, (sint8) (x - pl->ob->x), (sint8) (y - pl->ob->y)); 92 play_sound_player_only (pl, sound_num, x - pl->ob->x, y - pl->ob->y);
76 }
77 } 93 }
78 } 94 }
79} 95}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines