… | |
… | |
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 |
47 | typedef std::tr1::unordered_map |
40 | typedef std::tr1::unordered_map |
48 | < |
41 | < |
49 | const char *, |
42 | const char *, |
50 | faceidx, |
43 | faceidx, |
… | |
… | |
58 | faceidx |
51 | faceidx |
59 | sound_find (const char *str) |
52 | sound_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 | |
68 | void |
65 | void |
69 | sound_set (const char *str, faceidx face) |
66 | sound_set (const char *str, faceidx face) |
70 | { |
67 | { |
… | |
… | |
87 | client::play_sound (faceidx sound, int dx, int dy) |
84 | client::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 | uint8 vol = clamp (255 - idistance (dx, dy) * 255 / 10, 0, 255); |
|
|
99 | |
|
|
100 | // cut off volume here |
|
|
101 | if (vol < 16) |
|
|
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 | |