Don't allow playing a sound/soundgen key more than once at the same time on the same object (Fixes #2689)

openmw-39
scrawl 9 years ago
parent 5bd8ef247d
commit e71aa53574

@ -756,6 +756,7 @@ void CharacterController::handleTextKey(const std::string &groupname, const std:
if(evt.compare(0, 7, "sound: ") == 0) if(evt.compare(0, 7, "sound: ") == 0)
{ {
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager(); MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
sndMgr->stopSound3D(mPtr, evt.substr(7));
sndMgr->playSound3D(mPtr, evt.substr(7), 1.0f, 1.0f); sndMgr->playSound3D(mPtr, evt.substr(7), 1.0f, 1.0f);
return; return;
} }
@ -796,8 +797,11 @@ void CharacterController::handleTextKey(const std::string &groupname, const std:
MWBase::SoundManager::Play_NoPlayerLocal); MWBase::SoundManager::Play_NoPlayerLocal);
} }
else else
{
sndMgr->stopSound3D(mPtr, sound);
sndMgr->playSound3D(mPtr, sound, volume, pitch); sndMgr->playSound3D(mPtr, sound, volume, pitch);
} }
}
return; return;
} }

Loading…
Cancel
Save