Skip to content

Make helicopter sound respect sound effect volume setting #515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Asdow merged 1 commit into from
Sep 25, 2025
Merged

Make helicopter sound respect sound effect volume setting #515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions Tactical/Merc Entering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ void HandleHeliDrop( BOOLEAN fPlayer )
{
UINT8 ubScriptCode;
UINT32 uiClock;
INT32 iVol;
static INT32 iVol = 0;
INT32 cnt;
ANITILE_PARAMS AniParams;

Expand Down Expand Up @@ -618,11 +618,15 @@ void HandleHeliDrop( BOOLEAN fPlayer )
{
if( uiSoundSample!=NO_SAMPLE )
{
iVol=SoundGetVolume( uiSoundSample );
iVol=__min( HIGHVOLUME, iVol+5);
SoundSetVolume(uiSoundSample, iVol);
if(iVol==HIGHVOLUME)
iVol = __min(HIGHVOLUME, iVol + 5);
if ( GetSoundEffectsVolume() != 0)
{
SoundSetVolume(uiSoundSample, iVol);
}
if (iVol == HIGHVOLUME)
{
fFadingHeliIn=FALSE;
}
}
else
{
Expand All @@ -633,11 +637,11 @@ void HandleHeliDrop( BOOLEAN fPlayer )
{
if( uiSoundSample!=NO_SAMPLE )
{
iVol=SoundGetVolume(uiSoundSample);

iVol=__max( 0, iVol-5);

SoundSetVolume(uiSoundSample, iVol);
if (GetSoundEffectsVolume() != 0)
{
SoundSetVolume(uiSoundSample, iVol);
}
if(iVol==0)
{
// Stop sound
Expand Down
Loading