Fix loading of aircraft SFX breaks other engine SFX

(Addendum to d2ab55f)

Author: lopezloo

Client/game_sa/CAEVehicleAudioEntitySA.cpp

@@ -24,18 +24,53 @@ void CAEVehicleAudioEntitySA::LoadDriverSounds ( void )
     char soundType = pVehicleAudioEntity->m_nSettings.m_nVehicleSoundType;
 
     // If it's heli or plane sound type
-    if ( soundType == 4 || soundType == 5 )
+    if ( soundType == VEHICLE_AUDIO_HELI || soundType == VEHICLE_AUDIO_PLANE || soundType == VEHICLE_AUDIO_SEAPLANE )
     {
         // If there is accelerate sound bank defined
         if ( pVehicleAudioEntity->m_wEngineAccelerateSoundBankId != -1 )
         {
+            // We want to hear new sounds ASAP, so we need to stop current ones (which may be from other bankslot, dummy sounds)
+            unsigned char ucSlot = 0;
+            while ( ucSlot < 12 )
+            {
+                StopVehicleEngineSound ( ucSlot++ );
+            };
+
             CAEAudioHardware * pAEAudioHardware = pGame->GetAEAudioHardware ();
             // If this bank is not already loaded
             if ( !pAEAudioHardware->IsSoundBankLoaded ( pVehicleAudioEntity->m_wEngineAccelerateSoundBankId, BANKSLOT_ENGINE_RESIDENT ) )
             {
+                // Cancel sounds which uses same bankslot
+                DWORD dwFunc = FUNC_CAESoundManager__CancelSoundsInBankSlot;
+                DWORD dwThis = VAR_pAESoundManager;
+                DWORD dwBankSlot = BANKSLOT_ENGINE_RESIDENT;
+                bool bUnk = false;
+                _asm
+                {
+                    push    bUnk
+                    push    dwBankSlot
+                    mov     ecx, dwThis
+                    call    dwFunc
+                }
+
                 // Load it
                 pAEAudioHardware->LoadSoundBank ( pVehicleAudioEntity->m_wEngineAccelerateSoundBankId, BANKSLOT_ENGINE_RESIDENT );
             }
         }
     }
 }
+
+void CAEVehicleAudioEntitySA::StopVehicleEngineSound ( unsigned char ucSlot )
+{
+    DWORD dwFunc = FUNC_CAESound__Stop;
+    tVehicleSound * pVehicleSound = &m_pInterface->m_aEngineSounds [ ucSlot ];
+    if ( pVehicleSound->m_pSound )
+    {
+        DWORD dwThis = (DWORD) pVehicleSound->m_pSound;
+        _asm
+        {
+            mov     ecx, dwThis
+            call    dwFunc
+        }
+    }
+}

Client/game_sa/CAEVehicleAudioEntitySA.h

@@ -121,6 +121,9 @@
 #define FUNC_CAEVehicleAudioEntity__ProcessVehicle                                     0x501E10
 #define FUNC_CAEVehicleAudioEntity__Service                                            0x502280
 
+#define FUNC_CAESoundManager__CancelSoundsInBankSlot                                   0x4EFC60
+#define VAR_pAESoundManager                                                            0xB62CB0
+
 struct tVehicleAudioSettings
 {
     char    m_nVehicleSoundType;
@@ -250,6 +253,7 @@ class CAEVehicleAudioEntitySA : public CAEVehicleAudioEntity
 public:
                                         CAEVehicleAudioEntitySA                 ( CAEVehicleAudioEntitySAInterface * pInterface );
     void                                LoadDriverSounds                        ( void );
+    void                                StopVehicleEngineSound                  ( unsigned char ucSlot );
 
 private:
     CAEVehicleAudioEntitySAInterface *  m_pInterface;

Client/game_sa/CAudioEngineSA.h

@@ -41,6 +41,8 @@
 #define FUNC_CAudioEngine_ReportBulletHit                   0x506ec0
 #define FUNC_CAudioEngine_ReportWeaponEvent                 0x506f40
 
+#define FUNC_CAESound__Stop                     0x4EF1C0
+
 class CAudioEngineSAInterface
 {
 };

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -1475,6 +1475,12 @@ void CClientPed::WarpIntoVehicle ( CClientVehicle* pVehicle, unsigned int uiSeat
                         pInTask->ProcessPed ( m_pPlayerPed );
                         pInTask->Destroy ();
                     }
+
+                    if ( m_bIsLocalPlayer )
+                    {
+                        // Load accelerate sound bank so we can hear proper engine sound as passenger
+                        pGameVehicle->GetVehicleAudioEntity ()->LoadDriverSounds ();
+                    }
                 }
             }
 
@@ -4172,9 +4178,6 @@ void CClientPed::InternalWarpIntoVehicle ( CVehicle* pGameVehicle )
         {
             // Make sure we can't fall off
             SetCanBeKnockedOffBike ( false );
-
-            // Load driver sounds (GTA does it when local player enter vehicle)
-            pGameVehicle->GetVehicleAudioEntity ()->LoadDriverSounds ();
         }
 
         // Jax: make sure our camera is fixed on the new vehicle

Client/multiplayer_sa/CMultiplayerSA.cpp

@@ -294,6 +294,14 @@ DWORD RETURN_CTaskSimplyGangDriveBy__ProcessPed = 0x62D5AC;
 DWORD RETURN_CAERadioTrackManager__ChooseMusicTrackIndex             = 0x4EA2A0;
 DWORD RETURN_CAERadioTrackManager__ChooseMusicTrackIndex_Regenerate  = 0x04EA286;
 
+#define HOOKPOS_CAEVEhicleAudioEntity__ProcessDummyHeli     0x4FE9B9
+DWORD RETURN_CAEVEhicleAudioEntity__ProcessDummyHeli      = 0x4FEDFB;
+DWORD dwFUNC_CAEVehicleAudioEntity__ProcessAIHeli         = FUNC_CAEVehicleAudioEntity__ProcessAIHeli;
+
+#define HOOKPOS_CAEVEhicleAudioEntity__ProcessDummyProp     0x4FD96D
+DWORD RETURN_CAEVEhicleAudioEntity__ProcessDummyProp      = 0x4FDFAB;
+DWORD dwFUNC_CAEVehicleAudioEntity__ProcessAIProp         = FUNC_CAEVehicleAudioEntity__ProcessAIProp;
+
 CPed* pContextSwitchedPed = 0;
 CVector vecCenterOfWorld;
 FLOAT fFalseHeading;
@@ -509,6 +517,9 @@ void HOOK_CTaskSimpleGangDriveBy__ProcessPed();
 
 void HOOK_CAERadioTrackManager__ChooseMusicTrackIndex ( );
 
+void HOOK_CAEVehicleAudioEntity__ProcessDummyHeli ();
+void HOOK_CAEVehicleAudioEntity__ProcessDummyProp ();
+
 CMultiplayerSA::CMultiplayerSA()
 {
     // Unprotect all of the GTASA code at once and leave it that way
@@ -724,6 +735,9 @@ void CMultiplayerSA::InitHooks()
         HookInstall(HOOKPOS_CAERadioTrackManager__ChooseMusicTrackIndex, (DWORD) HOOK_CAERadioTrackManager__ChooseMusicTrackIndex, 10);
     }
 
+    HookInstall ( HOOKPOS_CAEVEhicleAudioEntity__ProcessDummyHeli, (DWORD) HOOK_CAEVehicleAudioEntity__ProcessDummyHeli, 5 );
+    HookInstall ( HOOKPOS_CAEVEhicleAudioEntity__ProcessDummyProp, (DWORD) HOOK_CAEVehicleAudioEntity__ProcessDummyProp, 5 );
+
     // Disable GTA setting g_bGotFocus to false when we minimize
     MemSet ( (void *)ADDR_GotFocus, 0x90, pGameInterface->GetGameVersion () == VERSION_EU_10 ? 6 : 10 );
 
@@ -6923,3 +6937,33 @@ void _declspec(naked) HOOK_CAERadioTrackManager__ChooseMusicTrackIndex ( )
         jmp RETURN_CAERadioTrackManager__ChooseMusicTrackIndex
     }
 }
+
+// Use AI heli rotor sound if player sound bank is not loaded
+void _declspec(naked) HOOK_CAEVehicleAudioEntity__ProcessDummyHeli ()
+{
+    _asm
+    {
+        // push our argument
+        push    [esp+8Ch+4]
+        mov     ecx, esi
+        // call twin function
+        call    dwFUNC_CAEVehicleAudioEntity__ProcessAIHeli
+        // go back
+        jmp     RETURN_CAEVEhicleAudioEntity__ProcessDummyHeli
+    }
+}
+
+// Use AI plane propeller sound if player sound bank is not loaded
+void _declspec(naked) HOOK_CAEVehicleAudioEntity__ProcessDummyProp ()
+{
+    _asm
+    {
+        // push our argument
+        push    [esp+98h+4]
+        mov     ecx, esi
+        // call twin function
+        call    dwFUNC_CAEVehicleAudioEntity__ProcessAIProp
+        // go back
+        jmp     RETURN_CAEVEhicleAudioEntity__ProcessDummyProp
+    }
+}

Client/sdk/game/CAEVehicleAudioEntity.h

@@ -11,6 +11,21 @@
 
 #pragma once
 
+enum eVehicleAudioType
+{
+    VEHICLE_AUDIO_CAR = 0,
+    VEHICLE_AUDIO_BIKE,
+    VEHICLE_AUDIO_BICYCLE,
+    VEHICLE_AUDIO_BOAT,
+    VEHICLE_AUDIO_HELI,
+    VEHICLE_AUDIO_PLANE,
+    VEHICLE_AUDIO_SEAPLANE, // unused?
+
+    VEHICLE_AUDIO_TRAIN = 8,
+    VEHICLE_AUDIO_SPECIAL, // RC vehicles, vortex, caddy, few trailers
+    VEHICLE_AUDIO_SILENT
+};
+
 class CAEVehicleAudioEntity
 {
 public: