diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-08-24 20:59:32 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-08-24 20:59:32 +0200 |
| commit | a3322f17d594f6fccf76dcd1acdbbb9de4558aa6 (patch) | |
| tree | 40e4ecce4ba6115bfa6cb9a8bbbcc9915ff2011c /src/audio | |
| parent | fixes to zones and vehicle comp rules (diff) | |
| parent | small fix (diff) | |
| download | re3-a3322f17d594f6fccf76dcd1acdbbb9de4558aa6.tar re3-a3322f17d594f6fccf76dcd1acdbbb9de4558aa6.tar.gz re3-a3322f17d594f6fccf76dcd1acdbbb9de4558aa6.tar.bz2 re3-a3322f17d594f6fccf76dcd1acdbbb9de4558aa6.tar.lz re3-a3322f17d594f6fccf76dcd1acdbbb9de4558aa6.tar.xz re3-a3322f17d594f6fccf76dcd1acdbbb9de4558aa6.tar.zst re3-a3322f17d594f6fccf76dcd1acdbbb9de4558aa6.zip | |
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/AudioScriptObject.cpp | 10 | ||||
| -rw-r--r-- | src/audio/AudioScriptObject.h | 3 | ||||
| -rw-r--r-- | src/audio/DMAudio.cpp | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/audio/AudioScriptObject.cpp b/src/audio/AudioScriptObject.cpp index 69d80fbc..ac30f757 100644 --- 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 index ff36474d..8110b2bb 100644 --- a/src/audio/AudioScriptObject.h +++ b/src/audio/AudioScriptObject.h @@ -7,6 +7,9 @@ public: 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 index 6859cba3..b3c16941 100644 --- a/src/audio/DMAudio.cpp +++ b/src/audio/DMAudio.cpp @@ -247,7 +247,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); @@ -264,7 +264,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) ) { |