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.15 by root, Thu Jul 26 00:27:09 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{
… …
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));
77} 74}
78 75
76//TODO: remove
77// for gcfclient-compatibility, to vanish at some point
78faceidx old_sound_index [SOUND_CAST_SPELL_0];
79
79/* 80/*
80 * Plays a sound for specified player only 81 * Plays a sound for specified player only
81 */ 82 */
82void 83void
83client::play_sound (faceidx sound, int dx, int dy) 84client::play_sound (faceidx sound, int dx, int dy)
84{ 85{
85 if (!sound) 86 if (!sound)
86 return; 87 return;
87 88
88 if (this->sound) 89 uint8 vol = 255 - idistance (dx, dy) * 255 / MAX_SOUND_DISTANCE;
89 {
90 // gcfclient compatibility
91 90
92 packet sl ("sound"); 91 // cut off volume here
92 if (vol <= 0)
93 return;
93 94
94 sl << uint8 (dx)
95 << uint8 (dy)
96 << uint16 (sound)
97 << uint8 (SOUND_NORMAL);
98
99 send_packet (sl);
100 }
101 else if (fx_want [FT_SOUND]) 95 if (fx_want [FT_SOUND])
102 { 96 {
103 // cfplus 97 // cfplus
104 send_face (sound); 98 send_face (sound);
105 flush_fx (); 99 flush_fx ();
106 100
… …
110 104
111 sl << uint8 (0) // group length 105 sl << uint8 (0) // group length
112 << uint8 (0) // type == one-time effect 106 << uint8 (0) // type == one-time effect
113 << ber32 (sound) 107 << ber32 (sound)
114 << sint8 (dx) 108 << sint8 (dx)
115 << sint8 (dy); 109 << sint8 (dy)
110 << uint8 (vol); // 0 == silent, 255 max
116 111
117 *len = sl.cur - len; // patch in group length 112 *len = sl.cur - len; // patch in group length
118 113
119 send_packet (sl); 114 send_packet (sl);
120 } 115 }
116 else if (this->sound)
117 {
118 //TODO: remove, or make bearable
119 // gcfclient compatibility
120
121 int gcfclient_sound;
122 for (gcfclient_sound = SOUND_CAST_SPELL_0; gcfclient_sound--; )
123 if (old_sound_index [gcfclient_sound] == sound)
124 {
125 packet sl ("sound");
126
127 sl << uint8 (dx)
128 << uint8 (dy)
129 << uint16 (gcfclient_sound)
130 << uint8 (SOUND_NORMAL);
131
132 send_packet (sl);
133
134 break;
135 }
136 }
121} 137}
122 138

Diff Legend

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