diff --git a/common/main/digi.h b/common/main/digi.h index 0979e1854..85df179ba 100644 --- a/common/main/digi.h +++ b/common/main/digi.h @@ -138,9 +138,8 @@ extern void digi_start_sound_queued( short soundnum, fix volume ); extern int digi_volume; #if defined(DXX_BUILD_DESCENT_I) extern int digi_sample_rate; -#elif defined(DXX_BUILD_DESCENT_II) -extern int Dont_start_sound_objects; #endif +extern int Dont_start_sound_objects; extern int SoundQ_channel; void digi_select_system(); diff --git a/similar/main/digiobj.cpp b/similar/main/digiobj.cpp index 9c72f4a32..af163c431 100644 --- a/similar/main/digiobj.cpp +++ b/similar/main/digiobj.cpp @@ -333,10 +333,8 @@ static void digi_unpause_looping_sound() digi_play_sample_looping_sub(); } -#if defined(DXX_BUILD_DESCENT_II) //hack to not start object when loading level int Dont_start_sound_objects = 0; -#endif static void digi_start_sound_object(sound_object &s) { @@ -346,10 +344,8 @@ static void digi_start_sound_object(sound_object &s) if ( s.volume <= 0 ) return; -#if defined(DXX_BUILD_DESCENT_II) if ( Dont_start_sound_objects ) return; -#endif // only use up to half the sound channels for "permanent" sounts if ((s.flags & SOF_PERMANENT) && (N_active_sound_objects >= max(1, digi_max_channels / 4))) @@ -378,13 +374,11 @@ static void digi_link_sound_common(const object_base &viewer, sound_object &so, so.max_distance = max_distance; so.volume = 0; so.pan = 0; -#if defined(DXX_BUILD_DESCENT_II) if (Dont_start_sound_objects) { //started at level start so.flags |= SOF_PERMANENT; so.channel = -1; } else -#endif { digi_get_sound_loc(viewer.orient, viewer.pos, segnum.absolute_sibling(viewer.segnum), pos, segnum, so.max_volume, diff --git a/similar/main/gameseq.cpp b/similar/main/gameseq.cpp index 2c2050c48..922b8b91f 100644 --- a/similar/main/gameseq.cpp +++ b/similar/main/gameseq.cpp @@ -760,8 +760,8 @@ static void set_sound_sources(fvcsegptridx &vcsegptridx, fvcvertptr &vcvertptr) #if defined(DXX_BUILD_DESCENT_II) auto &Walls = LevelUniqueWallSubsystemState.Walls; auto &vcwallptr = Walls.vcptr; - Dont_start_sound_objects = 1; #endif + Dont_start_sound_objects = 1; const auto get_eclip_for_tmap = [](const d_level_unique_tmap_info_state::TmapInfo_array &TmapInfo, const unique_side &side) { if (const auto tm2 = side.tmap_num2) @@ -819,10 +819,7 @@ static void set_sound_sources(fvcsegptridx &vcsegptridx, fvcvertptr &vcvertptr) } } } - -#if defined(DXX_BUILD_DESCENT_II) Dont_start_sound_objects = 0; -#endif } constexpr fix flash_dist=fl2f(.9);