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.21 by root, Wed Aug 1 00:26:05 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 16
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{
87client::play_sound (faceidx sound, int dx, int dy) 85client::play_sound (faceidx sound, int dx, int dy)
88{ 86{
89 if (!sound) 87 if (!sound)
90 return; 88 return;
91 89
92 if (dx < -MAX_SOUND_DISTANCE || dx > MAX_SOUND_DISTANCE) return; 90 uint8 vol = 255 - idistance (dx, dy) * 255 / MAX_SOUND_DISTANCE;
93 if (dy < -MAX_SOUND_DISTANCE || dy > MAX_SOUND_DISTANCE) return; 91
92 // cut off volume here
93 if (vol <= 0)
94 return;
94 95
95 if (fx_want [FT_SOUND]) 96 if (fx_want [FT_SOUND])
96 { 97 {
97 // cfplus 98 // cfplus
98 send_face (sound); 99 send_face (sound);
99 flush_fx (); 100 flush_fx ();
100
101 uint8 vol = clamp (255 - idistance (dx, dy) * 361 / MAX_SOUND_DISTANCE, 0, 255);
102
103 // cut off volume here
104 if (vol < 8)
105 return;
106 101
107 packet sl ("sc"); 102 packet sl ("sc");
108 103
109 uint8 *len = sl.cur; 104 uint8 *len = sl.cur;
110 105

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines