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.18 by root, Sat Jul 28 00:45:05 2007 UTC vs.
Revision 1.24 by root, Fri Sep 7 17:39:17 2007 UTC

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 <tr1/unordered_map>
38 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
46// the hashtable 39// the hashtable
47typedef std::tr1::unordered_map 40typedef std::tr1::unordered_map
48 < 41 <
49 const char *, 42 const char *,
50 faceidx, 43 faceidx,
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{
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
98 sint8 vol = idistance (dx, dy) * -80 / 10;
99
100 // cut off volume here
101 if (vol < -80)
102 return;
103 100
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
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 << sint8 (vol); // -128 == silent, 0 normal, 127 twice the amplitude 110 << uint8 (vol); // 0 == silent, 255 max
114 111
115 *len = sl.cur - len; // patch in group length 112 *len = sl.cur - len; // patch in group length
116 113
117 send_packet (sl); 114 send_packet (sl);
118 } 115 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines