Fixed memory leaks into engine_sound.emit_sound caused by the sounds not being emitted through the reliable channel.

jordanbriere · jordanbriere · commit f3e8ce56dc51 · 2020-05-04T10:53:06.000-04:00
diff --git a/src/core/modules/engines/blade/engines.h b/src/core/modules/engines/blade/engines.h
@@ -31,6 +31,7 @@
 // Includes.
 //-----------------------------------------------------------------------------
 #include "engine/IEngineSound.h"
+#include "modules/filters/filters_recipients.h"
 
 
 //-----------------------------------------------------------------------------
@@ -57,7 +58,7 @@ class GameIVEngineServerExt
 class IEngineSoundExt
 {
 public:
-	static void EmitSound(IEngineSound* pEngineSound, IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, 
+	static void EmitSound(IEngineSound* pEngineSound, MRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, 
 		float flVolume, float flAttenuation, int iFlags, int iPitch, const Vector *pOrigin, const Vector *pDirection,
 		tuple origins, bool bUpdatePositions, float soundtime, int speakerentity)
 	{
@@ -71,7 +72,8 @@ class IEngineSoundExt
 				vecOrigins.AddToTail(extract<Vector>(origins[i]));
 			}
 		}
-		
+
+		filter.m_bReliable = true;
 		pEngineSound->EmitSound(filter, iEntIndex, iChannel, pSample, -1, pSample, flVolume, flAttenuation, 0, iFlags, iPitch, pOrigin, pDirection,
 			pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity);
 	}
diff --git a/src/core/modules/engines/bms/engines.h b/src/core/modules/engines/bms/engines.h
@@ -31,6 +31,7 @@
 // Includes.
 //-----------------------------------------------------------------------------
 #include "engine/IEngineSound.h"
+#include "modules/filters/filters_recipients.h"
 
 
 //-----------------------------------------------------------------------------
@@ -57,7 +58,7 @@ class GameIVEngineServerExt
 class IEngineSoundExt
 {
 public:
-	static void EmitSound(IEngineSound* pEngineSound, IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, 
+	static void EmitSound(IEngineSound* pEngineSound, MRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, 
 		float flVolume, float flAttenuation, int iFlags, int iPitch, const Vector *pOrigin, const Vector *pDirection,
 		tuple origins, bool bUpdatePositions, float soundtime, int speakerentity)
 	{
@@ -71,7 +72,8 @@ class IEngineSoundExt
 				vecOrigins.AddToTail(extract<Vector>(origins[i]));
 			}
 		}
-		
+
+		filter.m_bReliable = true;
 		pEngineSound->EmitSound(filter, iEntIndex, iChannel, pSample, flVolume, flAttenuation, iFlags, iPitch, 0, pOrigin,
 			pDirection, pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity);
 	}
diff --git a/src/core/modules/engines/csgo/engines.h b/src/core/modules/engines/csgo/engines.h
@@ -31,6 +31,7 @@
 // Includes.
 //-----------------------------------------------------------------------------
 #include "engine/IEngineSound.h"
+#include "modules/filters/filters_recipients.h"
 
 
 //-----------------------------------------------------------------------------
@@ -57,7 +58,7 @@ class GameIVEngineServerExt
 class IEngineSoundExt
 {
 public:
-	static void EmitSound(IEngineSound* pEngineSound, IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, 
+	static void EmitSound(IEngineSound* pEngineSound, MRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, 
 		float flVolume, float flAttenuation, int iFlags, int iPitch, const Vector *pOrigin, const Vector *pDirection,
 		tuple origins, bool bUpdatePositions, float soundtime, int speakerentity)
 	{
@@ -71,7 +72,8 @@ class IEngineSoundExt
 				vecOrigins.AddToTail(extract<Vector>(origins[i]));
 			}
 		}
-		
+
+		filter.m_bReliable = true;
 		pEngineSound->EmitSound(filter, iEntIndex, iChannel, pSample, -1, pSample, flVolume, flAttenuation, 0, iFlags, iPitch, pOrigin, pDirection,
 			pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity);
 	}
diff --git a/src/core/modules/engines/gmod/engines.h b/src/core/modules/engines/gmod/engines.h
@@ -31,6 +31,7 @@
 // Includes.
 //-----------------------------------------------------------------------------
 #include "engine/IEngineSound.h"
+#include "modules/filters/filters_recipients.h"
 
 
 //-----------------------------------------------------------------------------
@@ -57,7 +58,7 @@ class GameIVEngineServerExt
 class IEngineSoundExt
 {
 public:
-	static void EmitSound(IEngineSound* pEngineSound, IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, 
+	static void EmitSound(IEngineSound* pEngineSound, MRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, 
 		float flVolume, float flAttenuation, int iFlags, int iPitch, const Vector *pOrigin, const Vector *pDirection,
 		tuple origins, bool bUpdatePositions, float soundtime, int speakerentity)
 	{
@@ -71,7 +72,8 @@ class IEngineSoundExt
 				vecOrigins.AddToTail(extract<Vector>(origins[i]));
 			}
 		}
-		
+
+		filter.m_bReliable = true;
 		pEngineSound->EmitSound(filter, iEntIndex, iChannel, pSample, flVolume, flAttenuation, iFlags, iPitch, 0, pOrigin, pDirection,
 			pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity);
 	}
diff --git a/src/core/modules/engines/l4d2/engines.h b/src/core/modules/engines/l4d2/engines.h
@@ -31,6 +31,7 @@
 // Includes.
 //-----------------------------------------------------------------------------
 #include "engine/IEngineSound.h"
+#include "modules/filters/filters_recipients.h"
 
 
 //-----------------------------------------------------------------------------
@@ -57,7 +58,7 @@ class GameIVEngineServerExt
 class IEngineSoundExt
 {
 public:
-	static void EmitSound(IEngineSound* pEngineSound, IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, 
+	static void EmitSound(IEngineSound* pEngineSound, MRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, 
 		float flVolume, float flAttenuation, int iFlags, int iPitch, const Vector *pOrigin, const Vector *pDirection,
 		tuple origins, bool bUpdatePositions, float soundtime, int speakerentity)
 	{
@@ -71,7 +72,8 @@ class IEngineSoundExt
 				vecOrigins.AddToTail(extract<Vector>(origins[i]));
 			}
 		}
-		
+
+		filter.m_bReliable = true;
 		pEngineSound->EmitSound(filter, iEntIndex, iChannel, pSample, flVolume, flAttenuation, iFlags, iPitch, pOrigin,
 			pDirection, pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity);
 	}
diff --git a/src/core/modules/engines/orangebox/engines.h b/src/core/modules/engines/orangebox/engines.h
@@ -32,6 +32,7 @@
 //-----------------------------------------------------------------------------
 #include "engine/IEngineSound.h"
 #include "eiface.h"
+#include "modules/filters/filters_recipients.h"
 
 
 //-----------------------------------------------------------------------------
@@ -63,7 +64,7 @@ class GameIVEngineServerExt
 class IEngineSoundExt
 {
 public:
-	static void EmitSound(IEngineSound* pEngineSound, IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, 
+	static void EmitSound(IEngineSound* pEngineSound, MRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample, 
 		float flVolume, float flAttenuation, int iFlags, int iPitch, const Vector *pOrigin, const Vector *pDirection,
 		tuple origins, bool bUpdatePositions, float soundtime, int speakerentity)
 	{
@@ -77,7 +78,8 @@ class IEngineSoundExt
 				vecOrigins.AddToTail(extract<Vector>(origins[i]));
 			}
 		}
-		
+
+		filter.m_bReliable = true;
 		pEngineSound->EmitSound(filter, iEntIndex, iChannel, pSample, flVolume, flAttenuation, iFlags, iPitch, 0, pOrigin,
 			pDirection, pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity);
 	}

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`// Includes.`
`32`	`32`	`//-----------------------------------------------------------------------------`
`33`	`33`	`#include "engine/IEngineSound.h"`
	`34`	`+#include "modules/filters/filters_recipients.h"`
`34`	`35`
`35`	`36`
`36`	`37`	`//-----------------------------------------------------------------------------`
`@@ -57,7 +58,7 @@ class GameIVEngineServerExt`
`57`	`58`	`class IEngineSoundExt`
`58`	`59`	`{`
`59`	`60`	`public:`
`60`		`- static void EmitSound(IEngineSound* pEngineSound, IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample,`
	`61`	`+ static void EmitSound(IEngineSound* pEngineSound, MRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample,`
`61`	`62`	`float flVolume, float flAttenuation, int iFlags, int iPitch, const Vector pOrigin, const Vector pDirection,`
`62`	`63`	`tuple origins, bool bUpdatePositions, float soundtime, int speakerentity)`
`63`	`64`	`{`
`@@ -71,7 +72,8 @@ class IEngineSoundExt`
`71`	`72`	`vecOrigins.AddToTail(extract<Vector>(origins[i]));`
`72`	`73`	`}`
`73`	`74`	`}`
`74`		`-`
	`75`	`+`
	`76`	`+ filter.m_bReliable = true;`
`75`	`77`	`pEngineSound->EmitSound(filter, iEntIndex, iChannel, pSample, -1, pSample, flVolume, flAttenuation, 0, iFlags, iPitch, pOrigin, pDirection,`
`76`	`78`	`pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity);`
`77`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`//-----------------------------------------------------------------------------`
`33`	`33`	`#include "engine/IEngineSound.h"`
`34`	`34`	`#include "eiface.h"`
	`35`	`+#include "modules/filters/filters_recipients.h"`
`35`	`36`
`36`	`37`
`37`	`38`	`//-----------------------------------------------------------------------------`
`@@ -63,7 +64,7 @@ class GameIVEngineServerExt`
`63`	`64`	`class IEngineSoundExt`
`64`	`65`	`{`
`65`	`66`	`public:`
`66`		`- static void EmitSound(IEngineSound* pEngineSound, IRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample,`
	`67`	`+ static void EmitSound(IEngineSound* pEngineSound, MRecipientFilter& filter, int iEntIndex, int iChannel, const char *pSample,`
`67`	`68`	`float flVolume, float flAttenuation, int iFlags, int iPitch, const Vector pOrigin, const Vector pDirection,`
`68`	`69`	`tuple origins, bool bUpdatePositions, float soundtime, int speakerentity)`
`69`	`70`	`{`
`@@ -77,7 +78,8 @@ class IEngineSoundExt`
`77`	`78`	`vecOrigins.AddToTail(extract<Vector>(origins[i]));`
`78`	`79`	`}`
`79`	`80`	`}`
`80`		`-`
	`81`	`+`
	`82`	`+ filter.m_bReliable = true;`
`81`	`83`	`pEngineSound->EmitSound(filter, iEntIndex, iChannel, pSample, flVolume, flAttenuation, iFlags, iPitch, 0, pOrigin,`
`82`	`84`	`pDirection, pUtlVecOrigins, bUpdatePositions, soundtime, speakerentity);`
`83`	`85`	`}`