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.3 by root, Sun Sep 10 13:43:34 2006 UTC vs.
Revision 1.14 by root, Sun Jul 1 05:00:21 2007 UTC

1
2/* 1/*
3 * static char *rcsid_sound_c = 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
4 * "$Id: sounds.C,v 1.3 2006/09/10 13:43:34 root Exp $"; 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>
5 */ 22 */
6 23
7/* Send bug reports to Raphael Quinet (quinet@montefiore.ulg.ac.be) */ 24/* Send bug reports to Raphael Quinet (quinet@montefiore.ulg.ac.be) */
8 25
9/** 26/**
29 */ 46 */
30void 47void
31play_sound_player_only (player *pl, short soundnum, sint8 x, sint8 y) 48play_sound_player_only (player *pl, short soundnum, sint8 x, sint8 y)
32{ 49{
33 char soundtype; 50 char soundtype;
34 SockList sl;
35 51
36 if (!pl->socket.sound) 52 if (!pl->ns->sound)
37 return; 53 return;
54
38 /* Do some quick conversion to the sound type we want. */ 55 /* Do some quick conversion to the sound type we want. */
39 if (soundnum >= SOUND_CAST_SPELL_0) 56 if (soundnum >= SOUND_CAST_SPELL_0)
40 { 57 {
41 soundtype = SOUND_SPELL; 58 soundtype = SOUND_SPELL;
42 soundnum -= SOUND_CAST_SPELL_0; 59 soundnum -= SOUND_CAST_SPELL_0;
43 } 60 }
44 else 61 else
45 soundtype = SOUND_NORMAL; 62 soundtype = SOUND_NORMAL;
46 63
47 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 64 packet sl;
48 strcpy ((char *) sl.buf, "sound "); 65
49 sl.len = strlen ((char *) sl.buf); 66 sl << "sound "
50 SockList_AddChar (&sl, x); 67 << uint8 (x)
51 SockList_AddChar (&sl, y); 68 << uint8 (y)
52 SockList_AddShort (&sl, soundnum); 69 << uint16 (soundnum)
53 SockList_AddChar (&sl, soundtype); 70 << uint8 (soundtype);
54 Send_With_Handling (&pl->socket, &sl); 71
55 free (sl.buf); 72 pl->ns->send_packet (sl);
56} 73}
57
58#define POW2(x) ((x) * (x))
59 74
60/** Plays some sound on map at x,y. */ 75/** Plays some sound on map at x,y. */
61void 76void
62play_sound_map (mapstruct *map, int x, int y, short sound_num) 77play_sound_map (maptile *map, int x, int y, short sound_num)
63{ 78{
64 player *pl;
65
66 if (sound_num >= NROF_SOUNDS) 79 if (sound_num >= NROF_SOUNDS)
67 { 80 {
68 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);
69 return; 82 return;
70 } 83 }
71 84
72 for (pl = first_player; pl; pl = pl->next) 85 for_all_players (pl)
73 { 86 {
74 if (pl->ob->map == map) 87 if (pl->ob->map == map)
75 { 88 {
76 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);
77 90
78 if (distance <= MAX_SOUND_DISTANCE) 91 if (distance <= MAX_SOUND_DISTANCE)
79 {
80 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);
81 }
82 } 93 }
83 } 94 }
84} 95}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines