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