From f484653f41a75e4f98b6b46371d43976028e3a90 Mon Sep 17 00:00:00 2001
From: Blixibon <acj3017@gmail.com>
Date: Sun, 24 Jan 2021 22:31:48 -0600
Subject: [PATCH] Fixed host_timescale scaling sounds when cheats are off

---
 sp/src/game/shared/SoundEmitterSystem.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/sp/src/game/shared/SoundEmitterSystem.cpp b/sp/src/game/shared/SoundEmitterSystem.cpp
index 19b37f11..390b5ca4 100644
--- a/sp/src/game/shared/SoundEmitterSystem.cpp
+++ b/sp/src/game/shared/SoundEmitterSystem.cpp
@@ -132,6 +132,15 @@ void Hack_FixEscapeChars( char *str )
 
 #ifdef MAPBASE
 static const ConVar *pHostTimescale;
+
+static float GetSoundPitchScale()
+{
+	static ConVarRef sv_cheats( "sv_cheats" );
+	if (sv_cheats.GetBool())
+		return pHostTimescale->GetFloat();
+
+	return 1.0f;
+}
 #endif
 
 //-----------------------------------------------------------------------------
@@ -534,7 +543,7 @@ public:
 			(soundlevel_t)params.soundlevel,
 			ep.m_nFlags,
 #ifdef MAPBASE
-			pHostTimescale->GetFloat() != 0.0f ? params.pitch * pHostTimescale->GetFloat() : params.pitch,
+			params.pitch * GetSoundPitchScale(),
 #else
 			params.pitch,
 #endif
@@ -617,7 +626,7 @@ public:
 				ep.m_SoundLevel, 
 				ep.m_nFlags, 
 #ifdef MAPBASE
-				pHostTimescale->GetFloat() != 0.0f ? ep.m_nPitch * pHostTimescale->GetFloat() : ep.m_nPitch,
+				ep.m_nPitch * GetSoundPitchScale(),
 #else
 				ep.m_nPitch, 
 #endif
@@ -843,10 +852,7 @@ public:
 		}
 
 #ifdef MAPBASE
-		if ( pHostTimescale->GetFloat() != 0.0f )
-		{
-			params.pitch *= pHostTimescale->GetFloat();
-		}
+		params.pitch *= GetSoundPitchScale();
 #endif
 
 #if defined( CLIENT_DLL )
@@ -978,10 +984,7 @@ public:
 		if ( pSample && ( Q_stristr( pSample, ".wav" ) || Q_stristr( pSample, ".mp3" )) )
 		{
 #ifdef MAPBASE
-			if ( pHostTimescale->GetFloat() != 0.0f )
-			{
-				pitch *= pHostTimescale->GetFloat();
-			}
+			pitch *= GetSoundPitchScale();
 #endif
 
 #if defined( CLIENT_DLL )