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.14 by root, Sun Jul 1 05:00:21 2007 UTC vs.
Revision 1.24 by root, Fri Sep 7 17:39:17 2007 UTC

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/** 37#include <tr1/unordered_map>
38 * Maximum distance a player may hear a sound from.
39 * This is only used for new client/server sound. If the sound source
40 * on the map is farther away than this, we don't sent it to the client.
41 */
42#define MAX_SOUND_DISTANCE 10
43 38
39// the hashtable
40typedef std::tr1::unordered_map
41 <
42 const char *,
43 faceidx,
44 str_hash,
45 str_equal,
46 slice_allocator< std::pair<const char *const, faceidx> >
47 > HT;
48
49static HT ht;
50
51faceidx
52sound_find (const char *str)
53{
54 auto (i, ht.find (str));
55
56 if (i != ht.end ())
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);
63}
64
65void
66sound_set (const char *str, faceidx face)
67{
68 auto (i, ht.find (str));
69
70 if (i != ht.end ())
71 i->second = face;
72 else
73 ht.insert (std::make_pair (strdup (str), face));
74}
75
76//TODO: remove
77// for gcfclient-compatibility, to vanish at some point
78faceidx old_sound_index [SOUND_CAST_SPELL_0];
79
44/** 80/*
45 * Plays a sound for specified player only 81 * Plays a sound for specified player only
46 */ 82 */
47void 83void
48play_sound_player_only (player *pl, short soundnum, sint8 x, sint8 y) 84client::play_sound (faceidx sound, int dx, int dy)
49{ 85{
50 char soundtype;
51
52 if (!pl->ns->sound) 86 if (!sound)
53 return; 87 return;
54 88
55 /* Do some quick conversion to the sound type we want. */ 89 uint8 vol = 255 - idistance (dx, dy) * 255 / MAX_SOUND_DISTANCE;
56 if (soundnum >= SOUND_CAST_SPELL_0) 90
91 // cut off volume here
92 if (vol <= 0)
93 return;
94
95 if (fx_want [FT_SOUND])
57 { 96 {
58 soundtype = SOUND_SPELL; 97 // cfplus
59 soundnum -= SOUND_CAST_SPELL_0; 98 send_face (sound);
99 flush_fx ();
100
101 packet sl ("sc");
102
103 uint8 *len = sl.cur;
104
105 sl << uint8 (0) // group length
106 << uint8 (0) // type == one-time effect
107 << ber32 (sound)
108 << sint8 (dx)
109 << sint8 (dy)
110 << uint8 (vol); // 0 == silent, 255 max
111
112 *len = sl.cur - len; // patch in group length
113
114 send_packet (sl);
60 } 115 }
61 else 116 else if (this->sound)
62 soundtype = SOUND_NORMAL; 117 {
118 //TODO: remove, or make bearable
119 // gcfclient compatibility
63 120
64 packet sl; 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");
65 126
66 sl << "sound "
67 << uint8 (x) 127 sl << uint8 (dx)
68 << uint8 (y) 128 << uint8 (dy)
69 << uint16 (soundnum) 129 << uint16 (gcfclient_sound)
70 << uint8 (soundtype); 130 << uint8 (SOUND_NORMAL);
71 131
72 pl->ns->send_packet (sl); 132 send_packet (sl);
133
134 break;
135 }
136 }
73} 137}
74 138
75/** Plays some sound on map at x,y. */
76void
77play_sound_map (maptile *map, int x, int y, short sound_num)
78{
79 if (sound_num >= NROF_SOUNDS)
80 {
81 LOG (llevError, "Tried to play an invalid sound num: %d\n", sound_num);
82 return;
83 }
84
85 for_all_players (pl)
86 {
87 if (pl->ob->map == map)
88 {
89 int distance = idistance (pl->ob->x - x, pl->ob->y - y);
90
91 if (distance <= MAX_SOUND_DISTANCE)
92 play_sound_player_only (pl, sound_num, x - pl->ob->x, y - pl->ob->y);
93 }
94 }
95}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines