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

actorid
Chris Robinson 12 years ago
parent 2f8daec379
commit fe36cc1de7

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

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

Loading…
Cancel
Save