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

Diff Legend

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