Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 85627b6b082c · 2025-04-12T04:00:55.000Z
300a6a7 Fix allocated vehicles audio (#4156)
diff --git a/Client/mods/deathmatch/logic/CClientVehicle.cpp b/Client/mods/deathmatch/logic/CClientVehicle.cpp
@@ -2497,11 +2497,11 @@ void CClientVehicle::Create()
             g_pGame->GetVehicleAudioSettingsManager()->SetNextSettings(m_pSoundSettingsEntry.get());
         else
         {
-            uint32_t modelId = m_usModel;
+            std::uint32_t modelId = m_usModel;
             if (!CClientVehicleManager::IsStandardModel(modelId))
                 modelId = g_pGame->GetModelInfo(m_usModel)->GetParentID();
 
-            g_pGame->GetVehicleAudioSettingsManager()->SetNextSettings(m_usModel);
+            g_pGame->GetVehicleAudioSettingsManager()->SetNextSettings(modelId);
         }
 
         // Create the vehicle

Original file line number	Diff line number	Diff line change
`@@ -2497,11 +2497,11 @@ void CClientVehicle::Create()`
`2497`	`2497`	`g_pGame->GetVehicleAudioSettingsManager()->SetNextSettings(m_pSoundSettingsEntry.get());`
`2498`	`2498`	`else`
`2499`	`2499`	`{`
`2500`		`- uint32_t modelId = m_usModel;`
	`2500`	`+ std::uint32_t modelId = m_usModel;`
`2501`	`2501`	`if (!CClientVehicleManager::IsStandardModel(modelId))`
`2502`	`2502`	`modelId = g_pGame->GetModelInfo(m_usModel)->GetParentID();`
`2503`	`2503`
`2504`		`- g_pGame->GetVehicleAudioSettingsManager()->SetNextSettings(m_usModel);`
	`2504`	`+ g_pGame->GetVehicleAudioSettingsManager()->SetNextSettings(modelId);`
`2505`	`2505`	`}`
`2506`	`2506`
`2507`	`2507`	`// Create the vehicle`