[Client] Only play sound for trap disarms in currently active cells

2 years ago · 023956fd41
parent b5e20d3701
commit 023956fd41
1 changed files with 4 additions and 1 deletions
--- 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)
                {