From 954f0f86036f9cb7d289b57e520e7437fdd6fc6e Mon Sep 17 00:00:00 2001 From: Kp Date: Tue, 24 Nov 2015 04:05:36 +0000 Subject: [PATCH] Remove unused SOUND_3D_THRESHHOLD --- similar/main/digiobj.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/similar/main/digiobj.cpp b/similar/main/digiobj.cpp index 055277c5b..bbb0a0ed8 100644 --- a/similar/main/digiobj.cpp +++ b/similar/main/digiobj.cpp @@ -353,13 +353,6 @@ static void digi_link_sound_common(cobjptr_t viewer, sound_object &so, const vms } } -//sounds longer than this get their 3d aspects updated -#if defined(DXX_BUILD_DESCENT_I) -#define SOUND_3D_THRESHHOLD (digi_sample_rate * 3 / 2) //1.5 seconds -#elif defined(DXX_BUILD_DESCENT_II) -#define SOUND_3D_THRESHHOLD (GameArg.SndDigiSampleRate * 3 / 2) //1.5 seconds -#endif - void digi_link_sound_to_object3( int org_soundnum, const vcobjptridx_t objnum, int forever, fix max_volume, const vm_distance max_distance, int loop_start, int loop_end ) { const vcobjptr_t viewer{Viewer}; @@ -378,7 +371,8 @@ void digi_link_sound_to_object3( int org_soundnum, const vcobjptridx_t objnum, i Int3(); return; } - if ( !forever ) { // && GameSounds[soundnum - SOUND_OFFSET].length < SOUND_3D_THRESHHOLD) { + if (!forever) + { // Hack to keep sounds from building up... digi_get_sound_loc( viewer->orient, viewer->pos, viewer->segnum, objnum->pos, objnum->segnum, max_volume,&volume, &pan, max_distance ); digi_play_sample_3d( org_soundnum, pan, volume, 0 ); @@ -429,7 +423,8 @@ static void digi_link_sound_to_pos2(int org_soundnum, const vcsegptridx_t segnum Int3(); return; } - if ( !forever ) { //&& GameSounds[soundnum - SOUND_OFFSET].length < SOUND_3D_THRESHHOLD) { + if (!forever) + { // Hack to keep sounds from building up... digi_get_sound_loc( viewer->orient, viewer->pos, viewer->segnum, pos, segnum, max_volume, &volume, &pan, max_distance ); digi_play_sample_3d( org_soundnum, pan, volume, 0 );