mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-23 05:11:33 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
scrawl 2016-03-24 18:31:37 +01:00
parent 5bd8ef247d
commit e71aa53574
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmechanics/character.cpp
View file

@ -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;
} }