Fix cAudioScriptObject

GTAmodding · Aug 20, 2020 · 0f5a77129225e2ff6587941dc11661b175df1f15 · 0f5a771
1 parent a9a1bf5
commit 0f5a77129225e2ff6587941dc11661b175df1f15
Unified Split

Showing with 15 additions and 2 deletions.

+10 −0 src/audio/AudioScriptObject.cpp

+3 −0 src/audio/AudioScriptObject.h

+2 −2 src/audio/DMAudio.cpp
diff --git a/src/audio/AudioScriptObject.cpp b/src/audio/AudioScriptObject.cpp
@@ -4,6 +4,16 @@
 #include "Pools.h"
 #include "DMAudio.h"
 
+cAudioScriptObject::cAudioScriptObject()
+{
+	Reset();
+};
+
+cAudioScriptObject::~cAudioScriptObject()
+{
+	Reset();
+};
+
 void
 cAudioScriptObject::Reset()
 {

diff --git a/src/audio/AudioScriptObject.h b/src/audio/AudioScriptObject.h
@@ -7,6 +7,9 @@ class cAudioScriptObject
 	CVector Posn;
 	int32 AudioEntity;
 
+	cAudioScriptObject();
+	~cAudioScriptObject();
+
 	void Reset(); /// ok
 
 	static void* operator new(size_t);

diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp
@@ -203,7 +203,7 @@ cDMAudio::ReportCrime(eCrimeType crime, const CVector &pos)
 int32
 cDMAudio::CreateLoopingScriptObject(cAudioScriptObject *scriptObject)
 {
-	int32 audioEntity = AudioManager.CreateEntity(AUDIOTYPE_SCRIPTOBJECT, (CPhysical *)scriptObject);
+	int32 audioEntity = AudioManager.CreateEntity(AUDIOTYPE_SCRIPTOBJECT, scriptObject);
 
 	if ( AEHANDLE_IS_OK(audioEntity) )
 		AudioManager.SetEntityStatus(audioEntity, true);
@@ -220,7 +220,7 @@ cDMAudio::DestroyLoopingScriptObject(int32 audioEntity)
 void
 cDMAudio::CreateOneShotScriptObject(cAudioScriptObject *scriptObject)
 {
-	int32 audioEntity = AudioManager.CreateEntity(AUDIOTYPE_SCRIPTOBJECT, (CPhysical *)scriptObject);
+	int32 audioEntity = AudioManager.CreateEntity(AUDIOTYPE_SCRIPTOBJECT, scriptObject);
 
 	if ( AEHANDLE_IS_OK(audioEntity) )
 	{