AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes for new boo assert

This commit is contained in:
Jack Andersen 2017-12-02 20:13:04 -10:00
parent 80fcd9d342
commit 92767f5147
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Audio/CSfxManager.cpp
View File

@ -216,8 +216,7 @@ void CSfxManager::KillAll(ESfxChannels chan)
for (auto it = chanObj.x48_handles.begin() ; it != chanObj.x48_handles.end() ;) for (auto it = chanObj.x48_handles.begin() ; it != chanObj.x48_handles.end() ;)
{ {
const CSfxHandle& handle = *it; const CSfxHandle& handle = *it;
if (handle->IsPlaying()) handle->Stop();
handle->Stop();
handle->Release(); handle->Release();
it = chanObj.x48_handles.erase(it); it = chanObj.x48_handles.erase(it);
} }
@ -392,8 +391,7 @@ void CSfxManager::StopSound(const CSfxHandle& handle)
if (!handle) if (!handle)
return; return;
m_doUpdate = true; m_doUpdate = true;
if (handle->IsPlaying()) handle->Stop();
handle->Stop();
handle->Release(); handle->Release();
CSfxChannel& chanObj = m_channels[int(m_currentChannel)]; CSfxChannel& chanObj = m_channels[int(m_currentChannel)];
chanObj.x48_handles.erase(handle); chanObj.x48_handles.erase(handle);
@ -501,8 +499,7 @@ void CSfxManager::StopAndRemoveAllEmitters()
for (auto it = chanObj.x48_handles.begin() ; it != chanObj.x48_handles.end() ;) for (auto it = chanObj.x48_handles.begin() ; it != chanObj.x48_handles.end() ;)
{ {
const CSfxHandle& handle = *it; const CSfxHandle& handle = *it;
if (handle->IsPlaying()) handle->Stop();
handle->Stop();
handle->Release(); handle->Release();
it = chanObj.x48_handles.erase(it); it = chanObj.x48_handles.erase(it);
} }
@ -708,6 +705,7 @@ void CSfxManager::Update(float dt)
const CSfxHandle& handle = *it; const CSfxHandle& handle = *it;
if (!handle->IsPlaying() && !handle->IsLooped()) if (!handle->IsPlaying() && !handle->IsLooped())
{ {
handle->Stop();
handle->Release(); handle->Release();
m_doUpdate = true; m_doUpdate = true;
it = chanObj.x48_handles.erase(it); it = chanObj.x48_handles.erase(it);

2
amuse

@ -1 +1 @@
Subproject commit 89233e98b59e6e720641af2f6d5f2d29f9c79864 Subproject commit 2f4d0e75410f10fbbdd3d732ad9fec80f19b6f1d

2
hecl

@ -1 +1 @@
Subproject commit 9fa4daf596c4a96a540aa15b85e55df7a1031c5c Subproject commit 3afe0163bfa7265253b640701ec36c963230707a