From b5e20d37011c96e3afaf622e56709d2791d53fec Mon Sep 17 00:00:00 2001 From: David Cernat Date: Sat, 30 Jul 2022 20:37:29 +0300 Subject: [PATCH] [Client] Always play ObjectSound at position of relevant object --- apps/openmw/mwmp/ObjectList.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/apps/openmw/mwmp/ObjectList.cpp b/apps/openmw/mwmp/ObjectList.cpp index bc647659e..3f3363583 100644 --- a/apps/openmw/mwmp/ObjectList.cpp +++ b/apps/openmw/mwmp/ObjectList.cpp @@ -881,21 +881,9 @@ void ObjectList::playObjectSounds(MWWorld::CellStore* cellStore) if (ptrFound) { LOG_APPEND(TimedLog::LOG_VERBOSE, "- Playing sound %s on %s", baseObject.soundId.c_str(), objectDescription.c_str()); - bool playAtPosition = false; - if (ptrFound.isInCell()) { - ESM::CellId localCell = Main::get().getLocalPlayer()->cell.getCellId(); - ESM::CellId soundCell = ptrFound.getCell()->getCell()->getCellId(); - playAtPosition = localCell == soundCell; - } - - if (playAtPosition) { - MWBase::Environment::get().getSoundManager()->playSound3D(ptrFound.getRefData().getPosition().asVec3(), - baseObject.soundId, baseObject.volume, baseObject.pitch, MWSound::Type::Sfx, MWSound::PlayMode::Normal, 0); - } - else { - MWBase::Environment::get().getSoundManager()->playSound3D(ptrFound, - baseObject.soundId, baseObject.volume, baseObject.pitch, MWSound::Type::Sfx, MWSound::PlayMode::Normal, 0); - } + + MWBase::Environment::get().getSoundManager()->playSound3D(ptrFound.getRefData().getPosition().asVec3(), + baseObject.soundId, baseObject.volume, baseObject.pitch, MWSound::Type::Sfx, MWSound::PlayMode::Normal, 0); } } }