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.16 by root, Thu Jul 26 00:38:34 2007 UTC vs.
Revision 1.27 by root, Mon Oct 12 14:00:59 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* Send bug reports to Raphael Quinet (quinet@montefiore.ulg.ac.be) */ 25/* Send bug reports to Raphael Quinet (quinet@montefiore.ulg.ac.be) */
25 26
26/** 27/**
… …
33#include <global.h> 34#include <global.h>
34#include <sproto.h> 35#include <sproto.h>
35#include <sounds.h> 36#include <sounds.h>
36 37
37#include <tr1/unordered_map> 38#include <tr1/unordered_map>
38
39/**
40 * Maximum distance a player may hear a sound from.
41 * This is only used for new client/server sound. If the sound source
42 * on the map is farther away than this, we don't sent it to the client.
43 */
44#define MAX_SOUND_DISTANCE 10
45 39
46// the hashtable 40// the hashtable
47typedef std::tr1::unordered_map 41typedef std::tr1::unordered_map
48 < 42 <
49 const char *, 43 const char *,
… …
58faceidx 52faceidx
59sound_find (const char *str) 53sound_find (const char *str)
60{ 54{
61 auto (i, ht.find (str)); 55 auto (i, ht.find (str));
62 56
63 return i == ht.end () 57 if (i != ht.end ())
64 ? 0
65 : i->second; 58 return i->second;
59
60 if (strncmp (str, "sound/", sizeof ("sound/") - 1))
61 str = format ("sound/%s", str);
62
63 return face_find (str);
66} 64}
67 65
68void 66void
69sound_set (const char *str, faceidx face) 67sound_set (const char *str, faceidx face)
70{ 68{
… …
74 i->second = face; 72 i->second = face;
75 else 73 else
76 ht.insert (std::make_pair (strdup (str), face)); 74 ht.insert (std::make_pair (strdup (str), face));
77} 75}
78 76
77//TODO: remove
78// for gcfclient-compatibility, to vanish at some point
79faceidx old_sound_index [SOUND_CAST_SPELL_0];
80
79/* 81/*
80 * Plays a sound for specified player only 82 * Plays a sound for specified player only
81 */ 83 */
82void 84void
83client::play_sound (faceidx sound, int dx, int dy) 85client::play_sound (faceidx sound, int dx, int dy)
84{ 86{
85 if (!sound) 87 if (!sound)
88 return;
89
90 uint8 vol = 255 - idistance (dx, dy) * 255 / MAX_SOUND_DISTANCE;
91
92 // cut off volume here
93 if (vol <= 0)
86 return; 94 return;
87 95
88 if (fx_want [FT_SOUND]) 96 if (fx_want [FT_SOUND])
89 { 97 {
90 // cfplus 98 // cfplus
… …
97 105
98 sl << uint8 (0) // group length 106 sl << uint8 (0) // group length
99 << uint8 (0) // type == one-time effect 107 << uint8 (0) // type == one-time effect
100 << ber32 (sound) 108 << ber32 (sound)
101 << sint8 (dx) 109 << sint8 (dx)
102 << sint8 (dy); 110 << sint8 (dy)
111 << uint8 (vol); // 0 == silent, 255 max
103 112
104 *len = sl.cur - len; // patch in group length 113 *len = sl.cur - len; // patch in group length
105 114
106 send_packet (sl); 115 send_packet (sl);
107 } 116 }
108 else if (this->sound) 117 else if (this->sound)
109 { 118 {
119 //TODO: remove, or make bearable
110 // gcfclient compatibility 120 // gcfclient compatibility
111 // fetch compatibility sound index first
112 121
122 int gcfclient_sound;
123 for (gcfclient_sound = SOUND_CAST_SPELL_0; gcfclient_sound--; )
124 if (old_sound_index [gcfclient_sound] == sound)
125 {
113 packet sl ("sound"); 126 packet sl ("sound");
114 127
115 sl << uint8 (dx) 128 sl << uint8 (dx)
116 << uint8 (dy) 129 << uint8 (dy)
117 << uint16 (sound) 130 << uint16 (gcfclient_sound)
118 << uint8 (SOUND_NORMAL); 131 << uint8 (SOUND_NORMAL);
119 132
120 send_packet (sl); 133 send_packet (sl);
134
135 break;
136 }
121 } 137 }
122} 138}
123 139

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines