CClientSoundManager: make sure master volume is used

Author: patrikjuvonen

Client/mods/deathmatch/logic/CClientPlayerVoice.cpp

@@ -35,7 +35,7 @@ CClientPlayerVoice::CClientPlayerVoice(CClientPlayer* pPlayer, CVoiceRecorder* p
     // Get initial voice volume
     m_fVolume = 1.0f;
     g_pCore->GetCVars()->Get("voicevolume", m_fVolumeScale);
-    m_fVolumeScale *= g_pCore->GetCVars()->GetValue<float>("mastervolume");
+    m_fVolumeScale *= g_pCore->GetCVars()->GetValue<float>("mastervolume", 1.0f);
 
     m_fVolume = m_fVolume * m_fVolumeScale;
 
@@ -115,7 +115,7 @@ void CClientPlayerVoice::DoPulse(void)
     m_CS.Lock();
     float fPreviousVolume = 0.0f;
     g_pCore->GetCVars()->Get("voicevolume", fPreviousVolume);
-    fPreviousVolume *= g_pCore->GetCVars()->GetValue<float>("mastervolume");
+    fPreviousVolume *= g_pCore->GetCVars()->GetValue<float>("mastervolume", 1.0f);
     m_CS.Unlock();
 
     if (fPreviousVolume != m_fVolumeScale && m_pPlayer->IsLocalPlayer() == false)

Client/mods/deathmatch/logic/CClientSoundManager.cpp

@@ -258,13 +258,16 @@ int CClientSoundManager::GetFxEffectFromName(const std::string& strEffectName)
 
 void CClientSoundManager::UpdateVolume()
 {
-    // set our mta or master sound volume if the cvar changed
+    // set our mta sound volume if mtavolume or mastervolume cvar changed
     float fValue = 0.0f;
+
     if (!m_bMinimizeMuted)
     {
+        float fMasterVolume = g_pCore->GetCVars()->GetValue<float>("mastervolume", 1.0f);
+
         if (g_pCore->GetCVars()->Get("mtavolume", fValue))
         {
-            fValue *= g_pCore->GetCVars()->GetValue<float>("mastervolume");
+            fValue *= fMasterVolume;
 
             if (fValue * 10000 == BASS_GetConfig(BASS_CONFIG_GVOL_STREAM))
                 return;
@@ -273,7 +276,7 @@ void CClientSoundManager::UpdateVolume()
         }
         else
         {
-            fValue = 1.0f;
+            fValue = fMasterVolume;
         }
     }