| … | |
… | |
| 39 | /** |
39 | /** |
| 40 | * Maximum distance a player may hear a sound from. |
40 | * Maximum distance a player may hear a sound from. |
| 41 | * 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 |
| 42 | * 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. |
| 43 | */ |
43 | */ |
| 44 | #define MAX_SOUND_DISTANCE 10 |
44 | #define MAX_SOUND_DISTANCE 16 |
| 45 | |
45 | |
| 46 | // the hashtable |
46 | // the hashtable |
| 47 | typedef std::tr1::unordered_map |
47 | typedef std::tr1::unordered_map |
| 48 | < |
48 | < |
| 49 | const char *, |
49 | const char *, |
| … | |
… | |
| 58 | faceidx |
58 | faceidx |
| 59 | sound_find (const char *str) |
59 | sound_find (const char *str) |
| 60 | { |
60 | { |
| 61 | auto (i, ht.find (str)); |
61 | auto (i, ht.find (str)); |
| 62 | |
62 | |
| 63 | return i == ht.end () |
63 | if (i != ht.end ()) |
| 64 | ? 0 |
|
|
| 65 | : i->second; |
64 | return i->second; |
|
|
65 | |
|
|
66 | //TODO: really fall back to face name? |
|
|
67 | char face[128]; |
|
|
68 | snprintf (face, 128, "sound/%s", str); |
|
|
69 | return face_find (face); |
| 66 | } |
70 | } |
| 67 | |
71 | |
| 68 | void |
72 | void |
| 69 | sound_set (const char *str, faceidx face) |
73 | sound_set (const char *str, faceidx face) |
| 70 | { |
74 | { |
| … | |
… | |
| 87 | client::play_sound (faceidx sound, int dx, int dy) |
91 | client::play_sound (faceidx sound, int dx, int dy) |
| 88 | { |
92 | { |
| 89 | if (!sound) |
93 | if (!sound) |
| 90 | return; |
94 | return; |
| 91 | |
95 | |
|
|
96 | if (dx < -MAX_SOUND_DISTANCE || dx > MAX_SOUND_DISTANCE) return; |
|
|
97 | if (dy < -MAX_SOUND_DISTANCE || dy > MAX_SOUND_DISTANCE) return; |
|
|
98 | |
| 92 | if (fx_want [FT_SOUND]) |
99 | if (fx_want [FT_SOUND]) |
| 93 | { |
100 | { |
| 94 | // cfplus |
101 | // cfplus |
| 95 | send_face (sound); |
102 | send_face (sound); |
| 96 | flush_fx (); |
103 | flush_fx (); |
| 97 | |
104 | |
| 98 | uint8 vol = clamp (255 - idistance (dx, dy) * 255 / 10, 0, 255); |
105 | uint8 vol = clamp (255 - idistance (dx, dy) * 361 / MAX_SOUND_DISTANCE, 0, 255); |
| 99 | |
106 | |
| 100 | // cut off volume here |
107 | // cut off volume here |
| 101 | if (vol < 16) |
108 | if (vol < 8) |
| 102 | return; |
109 | return; |
| 103 | |
110 | |
| 104 | packet sl ("sc"); |
111 | packet sl ("sc"); |
| 105 | |
112 | |
| 106 | uint8 *len = sl.cur; |
113 | uint8 *len = sl.cur; |
