mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-04 15:45:34 +00:00
Code Issues Releases Wiki Activity

Fix playing pending voices without a Ptr

Browse source
This commit is contained in:
Chris Robinson 2015-12-02 16:07:19 -08:00
parent 2face3d0a9
commit f19f1c47c8
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -890,13 +890,17 @@ namespace MWSound
DecoderPtr decoder = penditer->second.first; DecoderPtr decoder = penditer->second.first;
decoder->rewind(); decoder->rewind();
MWBase::SoundStreamPtr sound;
MWWorld::Ptr ptr = penditer->first; MWWorld::Ptr ptr = penditer->first;
if(ptr == MWWorld::Ptr())
sound = playVoice(decoder, osg::Vec3f(), true);
else
{
const ESM::Position &pos = ptr.getRefData().getPosition(); const ESM::Position &pos = ptr.getRefData().getPosition();
const osg::Vec3f objpos(pos.asVec3()); const osg::Vec3f objpos(pos.asVec3());
MWBase::SoundStreamPtr sound = playVoice(decoder, sound = playVoice(decoder, objpos, (ptr == MWMechanics::getPlayer()));
objpos, (ptr == MWMechanics::getPlayer()) }
);
mActiveSaySounds[ptr] = std::make_pair(sound, loudness); mActiveSaySounds[ptr] = std::make_pair(sound, loudness);
} }
catch(std::exception &e) { catch(std::exception &e) {