From 325218907d494d1128a7f330ec665ce361c02d9e Mon Sep 17 00:00:00 2001
From: Asdow <20314541+Asdow@users.noreply.github.com>
Date: Thu, 25 Sep 2025 22:54:34 +0300
Subject: [PATCH] Make helicopter sound respect sound effect volume setting

Helicopter sound would play upon heli insertion even if sound effects volume was set to 0 in options.
---
 Tactical/Merc Entering.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/Tactical/Merc Entering.cpp b/Tactical/Merc Entering.cpp
index 2ca826691..630a9d453 100644
--- a/Tactical/Merc Entering.cpp	
+++ b/Tactical/Merc Entering.cpp	
@@ -481,7 +481,7 @@ void HandleHeliDrop( BOOLEAN fPlayer )
 {
 	UINT8 ubScriptCode;
 	UINT32	uiClock;
-	INT32 iVol;
+	static INT32 iVol = 0;
 	INT32 cnt;
 	ANITILE_PARAMS	AniParams;
 
@@ -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
 				{
@@ -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