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

Diff Legend

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