mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-24 10:39:44 +00:00
Code Issues Releases Wiki Activity

Update the Ptr in SoundManager for references moved to a different cell. Fixes looping sounds not stopping after a moved object was already deleted.

Browse source
This commit is contained in:
scrawl 2014-01-20 12:05:13 +01:00
parent 5dd3cfa09a
commit ba5300b071
4 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwbase/soundmanager.hpp
View file

@ -147,6 +147,8 @@ namespace MWBase
virtual void update(float duration) = 0; virtual void update(float duration) = 0;
virtual void setListenerPosDir(const Ogre::Vector3 &pos, const Ogre::Vector3 &dir, const Ogre::Vector3 &up) = 0; virtual void setListenerPosDir(const Ogre::Vector3 &pos, const Ogre::Vector3 &dir, const Ogre::Vector3 &up) = 0;
virtual void updatePtr (const MWWorld::Ptr& old, const MWWorld::Ptr& updated) = 0;
}; };
} }

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

@ -640,6 +640,15 @@ namespace MWSound
mListenerUp = up; mListenerUp = up;
} }
void SoundManager::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &updated)
{
for (SoundMap::iterator snditer = mActiveSounds.begin(); snditer != mActiveSounds.end(); ++snditer)
{
if (snditer->second.first == old)
snditer->second.first = updated;
}
}
// Default readAll implementation, for decoders that can't do anything // Default readAll implementation, for decoders that can't do anything
// better // better
void Sound_Decoder::readAll(std::vector<char> &output) void Sound_Decoder::readAll(std::vector<char> &output)

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

@ -148,6 +148,8 @@ namespace MWSound
virtual void update(float duration); virtual void update(float duration);
virtual void setListenerPosDir(const Ogre::Vector3 &pos, const Ogre::Vector3 &dir, const Ogre::Vector3 &up); virtual void setListenerPosDir(const Ogre::Vector3 &pos, const Ogre::Vector3 &dir, const Ogre::Vector3 &up);
virtual void updatePtr (const MWWorld::Ptr& old, const MWWorld::Ptr& updated);
}; };
} }

1
apps/openmw/mwworld/worldimp.cpp
View file

@ -905,6 +905,7 @@ namespace MWWorld
MWWorld::Class::get(ptr).copyToCell(ptr, newCell, pos); MWWorld::Class::get(ptr).copyToCell(ptr, newCell, pos);
mRendering->updateObjectCell(ptr, copy); mRendering->updateObjectCell(ptr, copy);
MWBase::Environment::get().getSoundManager()->updatePtr (ptr, copy);
MWBase::MechanicsManager *mechMgr = MWBase::Environment::get().getMechanicsManager(); MWBase::MechanicsManager *mechMgr = MWBase::Environment::get().getMechanicsManager();
mechMgr->updateCell(ptr, copy); mechMgr->updateCell(ptr, copy);