From 624baa6d89679406fccd1314c2b00626d2fc0c7a Mon Sep 17 00:00:00 2001 From: elsid Date: Sun, 28 Jun 2020 19:59:53 +0200 Subject: [PATCH] Check distance to object before load sound --- apps/openmw/mwsound/soundmanagerimp.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp index eed935e61..eabda4cc3 100644 --- a/apps/openmw/mwsound/soundmanagerimp.cpp +++ b/apps/openmw/mwsound/soundmanagerimp.cpp @@ -620,14 +620,14 @@ namespace MWSound if(!mOutput->isInitialized()) return nullptr; + const osg::Vec3f objpos(ptr.getRefData().getPosition().asVec3()); + if ((mode & PlayMode::RemoveAtDistance) && (mListenerPos - objpos).length2() > 2000 * 2000) + return nullptr; + // Look up the sound in the ESM data Sound_Buffer *sfx = loadSound(Misc::StringUtils::lowerCase(soundId)); if(!sfx) return nullptr; - const osg::Vec3f objpos(ptr.getRefData().getPosition().asVec3()); - if((mode&PlayMode::RemoveAtDistance) && (mListenerPos-objpos).length2() > 2000*2000) - return nullptr; - // Only one copy of given sound can be played at time on ptr, so stop previous copy stopSound(sfx, ptr);