BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Does not crash when removing soundemitter component.

Browse Source
This commit is contained in:
stiffly
2016-01-14 15:06:26 +01:00
parent 7f0ff6c4d7
commit c916185a7c
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Sound/SoundSystem.cpp
+3 -4
View File
@@ -59,16 +59,16 @@ void SoundSystem::deleteInactiveEmitters()
{ {
std::unordered_map<EntityID, Source*>::iterator it; std::unordered_map<EntityID, Source*>::iterator it;
for (it = m_Sources.begin(); it != m_Sources.end();) { for (it = m_Sources.begin(); it != m_Sources.end();) {
if (m_World->ValidEntity((*it).first)) { if (m_World->ValidEntity(it->first)
&& m_World->HasComponent(it->first, "SoundEmitter")) {
if (getSourceState(it->second->ALsource) != AL_STOPPED) { if (getSourceState(it->second->ALsource) != AL_STOPPED) {
// Nothing to see here, move along // Nothing to see here, move along
it++; it++;
continue; continue;
} else { } else {
// Sound has been stopped / finished playing // Sound has been stopped / finished playing. And has correct component.
alDeleteBuffers(1, &it->second->ALsource); alDeleteBuffers(1, &it->second->ALsource);
alDeleteSources(1, &it->second->ALsource); alDeleteSources(1, &it->second->ALsource);
delete it->second->SoundResource;
m_World->DeleteEntity(it->first); m_World->DeleteEntity(it->first);
it = m_Sources.erase(it); it = m_Sources.erase(it);
} }
@@ -77,7 +77,6 @@ void SoundSystem::deleteInactiveEmitters()
stopSound((*it).second); stopSound((*it).second);
alDeleteBuffers(1, &it->second->ALsource); alDeleteBuffers(1, &it->second->ALsource);
alDeleteSources(1, &it->second->ALsource); alDeleteSources(1, &it->second->ALsource);
delete it->second->SoundResource;
it = m_Sources.erase(it); it = m_Sources.erase(it);
} }
} }