mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 23:45:35 +00:00
Code Issues Releases Wiki Activity

Don't try to resume sound types that aren't paused

Browse source
This commit is contained in:
Chris Robinson 2012-12-18 04:35:24 -08:00
parent 2f8daec379
commit fe36cc1de7
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,6 +52,7 @@ namespace MWSound
, mMusicVolume(1.0f) , mMusicVolume(1.0f)
, mFootstepsVolume(1.0f) , mFootstepsVolume(1.0f)
, mVoiceVolume(1.0f) , mVoiceVolume(1.0f)
, mPausedSoundTypes(0)
{ {
if(!useSound) if(!useSound)
return; return;
@ -426,13 +427,21 @@ namespace MWSound
void SoundManager::pauseSounds(int types) void SoundManager::pauseSounds(int types)
{ {
if(mOutput->isInitialized()) if(mOutput->isInitialized())
{
types &= Play_TypeMask;
mOutput->pauseSounds(types); mOutput->pauseSounds(types);
mPausedSoundTypes |= types;
}
} }
void SoundManager::resumeSounds(int types) void SoundManager::resumeSounds(int types)
{ {
if(mOutput->isInitialized()) if(mOutput->isInitialized())
{
types &= types&Play_TypeMask&mPausedSoundTypes;
mOutput->resumeSounds(types); mOutput->resumeSounds(types);
mPausedSoundTypes &= ~types;
}
} }

2
apps/openmw/mwsound/soundmanagerimp.hpp
View file

@ -52,6 +52,8 @@ namespace MWSound
Ogre::Vector3 mListenerDir; Ogre::Vector3 mListenerDir;
Ogre::Vector3 mListenerUp; Ogre::Vector3 mListenerUp;
int mPausedSoundTypes;
std::string lookup(const std::string &soundId, std::string lookup(const std::string &soundId,
float &volume, float &min, float &max); float &volume, float &min, float &max);
void streamMusicFull(const std::string& filename); void streamMusicFull(const std::string& filename);