--- deliantra/server/socket/sounds.C 2007/07/28 00:45:05 1.18 +++ deliantra/server/socket/sounds.C 2007/08/01 00:26:05 1.21 @@ -41,7 +41,7 @@ * This is only used for new client/server sound. If the sound source * on the map is farther away than this, we don't sent it to the client. */ -#define MAX_SOUND_DISTANCE 10 +#define MAX_SOUND_DISTANCE 16 // the hashtable typedef std::tr1::unordered_map @@ -89,16 +89,19 @@ if (!sound) return; + if (dx < -MAX_SOUND_DISTANCE || dx > MAX_SOUND_DISTANCE) return; + if (dy < -MAX_SOUND_DISTANCE || dy > MAX_SOUND_DISTANCE) return; + if (fx_want [FT_SOUND]) { // cfplus send_face (sound); flush_fx (); - sint8 vol = idistance (dx, dy) * -80 / 10; + uint8 vol = clamp (255 - idistance (dx, dy) * 361 / MAX_SOUND_DISTANCE, 0, 255); // cut off volume here - if (vol < -80) + if (vol < 8) return; packet sl ("sc"); @@ -110,7 +113,7 @@ << ber32 (sound) << sint8 (dx) << sint8 (dy) - << sint8 (vol); // -128 == silent, 0 normal, 127 twice the amplitude + << uint8 (vol); // 0 == silent, 255 max *len = sl.cur - len; // patch in group length