From 023956fd41dac18fb10ce1e408eccd1d358a36f1 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Sat, 30 Jul 2022 20:44:03 +0300 Subject: [PATCH] [Client] Only play sound for trap disarms in currently active cells --- apps/openmw/mwmp/ObjectList.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwmp/ObjectList.cpp b/apps/openmw/mwmp/ObjectList.cpp index 3f3363583..46c91ca65 100644 --- a/apps/openmw/mwmp/ObjectList.cpp +++ b/apps/openmw/mwmp/ObjectList.cpp @@ -698,7 +698,10 @@ void ObjectList::triggerTrapObjects(MWWorld::CellStore* cellStore) { if (baseObject.trapAction == mwmp::BaseObjectList::TRAP_ACTION::DISARM) { - MWBase::Environment::get().getSoundManager()->playSound3D(ptrFound, "Disarm Trap", 1.0f, 1.0f); + if (mwmp::Main::get().getCellController()->isActiveWorldCell(cell)) + { + MWBase::Environment::get().getSoundManager()->playSound3D(ptrFound, "Disarm Trap", 1.0f, 1.0f); + } } else if (baseObject.trapAction == mwmp::BaseObjectList::TRAP_ACTION::TRIGGER) {