mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:23:52 +00:00
Code Issues Releases Wiki Activity

Add some missing sound handling

Browse source
This commit is contained in:
Chris Robinson 2015-11-23 04:48:18 -08:00
parent e362896817
commit 4073495070
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw/mwsound/soundmanagerimp.cpp
View file

@ -95,6 +95,7 @@ namespace MWSound
mUnderwaterSound.reset(); mUnderwaterSound.reset();
mActiveSounds.clear(); mActiveSounds.clear();
mActiveSaySounds.clear(); mActiveSaySounds.clear();
mUnderwaterSound.reset();
mMusic.reset(); mMusic.reset();
if(mOutput->isInitialized()) if(mOutput->isInitialized())
{ {
@ -832,10 +833,18 @@ namespace MWSound
SoundNamePairList::iterator sndname = snditer->second.begin(); SoundNamePairList::iterator sndname = snditer->second.begin();
for(;sndname != snditer->second.end();++sndname) for(;sndname != snditer->second.end();++sndname)
{ {
sndname->first->mBaseVolume = volumeFromType(sndname->first->getPlayType()); MWBase::SoundPtr sound = sndname->first;
sndname->first->update(); sound->mBaseVolume = volumeFromType(sound->getPlayType());
sound->update();
} }
} }
SaySoundMap::iterator sayiter = mActiveSaySounds.begin();
for(;sayiter != mActiveSaySounds.end();++sayiter)
{
MWBase::SoundPtr sound = sayiter->second.first;
sound->mBaseVolume = volumeFromType(sound->getPlayType());
sound->update();
}
if(mMusic) if(mMusic)
{ {
mMusic->mBaseVolume = volumeFromType(mMusic->getPlayType()); mMusic->mBaseVolume = volumeFromType(mMusic->getPlayType());
@ -952,6 +961,7 @@ namespace MWSound
for(;sayiter != mActiveSaySounds.end();++sayiter) for(;sayiter != mActiveSaySounds.end();++sayiter)
sayiter->second.first->stop(); sayiter->second.first->stop();
mActiveSaySounds.clear(); mActiveSaySounds.clear();
mUnderwaterSound.reset();
stopMusic(); stopMusic();
} }
} }