mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:53:52 +00:00
Code Issues Releases Wiki Activity

Remove a really unnecessary method

Browse source
This commit is contained in:
Chris Robinson 2015-11-25 00:09:40 -08:00
parent 73448c72f6
commit aac903484c
5 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -127,9 +127,6 @@ namespace MWBase
virtual void stopSound3D(const MWWorld::Ptr &reference) = 0; virtual void stopSound3D(const MWWorld::Ptr &reference) = 0;
///< Stop the given object from playing all sounds. ///< Stop the given object from playing all sounds.
virtual void stopSound(MWBase::SoundPtr sound) = 0;
///< Stop the given sound handle
virtual void stopSound(const MWWorld::CellStore *cell) = 0; virtual void stopSound(const MWWorld::CellStore *cell) = 0;
///< Stop all sounds for the given cell. ///< Stop all sounds for the given cell.

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

@ -600,11 +600,6 @@ namespace MWSound
return sound; return sound;
} }
void SoundManager::stopSound (MWBase::SoundPtr sound)
{
sound->stop();
}
void SoundManager::stopSound3D(const MWWorld::Ptr &ptr, const std::string& soundId) void SoundManager::stopSound3D(const MWWorld::Ptr &ptr, const std::string& soundId)
{ {
SoundMap::iterator snditer = mActiveSounds.find(ptr); SoundMap::iterator snditer = mActiveSounds.find(ptr);

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

@ -181,9 +181,6 @@ namespace MWSound
virtual void stopSound3D(const MWWorld::Ptr &reference); virtual void stopSound3D(const MWWorld::Ptr &reference);
///< Stop the given object from playing all sounds. ///< Stop the given object from playing all sounds.
virtual void stopSound(MWBase::SoundPtr sound);
///< Stop the given sound handle
virtual void stopSound(const MWWorld::CellStore *cell); virtual void stopSound(const MWWorld::CellStore *cell);
///< Stop all sounds for the given cell. ///< Stop all sounds for the given cell.

5
apps/openmw/mwworld/projectilemanager.cpp
View file

@ -190,8 +190,7 @@ namespace MWWorld
{ {
MWBase::Environment::get().getWorld()->explodeSpell(pos, it->mEffects, caster, ESM::RT_Target, it->mSpellId, it->mSourceName); MWBase::Environment::get().getWorld()->explodeSpell(pos, it->mEffects, caster, ESM::RT_Target, it->mSpellId, it->mSourceName);
MWBase::Environment::get().getSoundManager()->stopSound(it->mSound); it->mSound->stop();
mParent->removeChild(it->mNode); mParent->removeChild(it->mNode);
it = mMagicBolts.erase(it); it = mMagicBolts.erase(it);
@ -265,7 +264,7 @@ namespace MWWorld
for (std::vector<MagicBoltState>::iterator it = mMagicBolts.begin(); it != mMagicBolts.end(); ++it) for (std::vector<MagicBoltState>::iterator it = mMagicBolts.begin(); it != mMagicBolts.end(); ++it)
{ {
mParent->removeChild(it->mNode); mParent->removeChild(it->mNode);
MWBase::Environment::get().getSoundManager()->stopSound(it->mSound); it->mSound->stop();
} }
mMagicBolts.clear(); mMagicBolts.clear();
} }

4
apps/openmw/mwworld/weather.cpp
View file

@ -735,12 +735,10 @@ void WeatherManager::update(float duration, bool paused)
void WeatherManager::stopSounds() void WeatherManager::stopSounds()
{ {
if (mAmbientSound.get()) if (mAmbientSound.get())
{ mAmbientSound->stop();
MWBase::Environment::get().getSoundManager()->stopSound(mAmbientSound);
mAmbientSound.reset(); mAmbientSound.reset();
mPlayingSoundID.clear(); mPlayingSoundID.clear();
} }
}
float WeatherManager::getWindSpeed() const float WeatherManager::getWindSpeed() const
{ {