mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-20 10:20:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pleaseshutupyoustupiddoor' into 'master'

Browse Source 
Don't stop playing sounds attached to removed objects (bug #6896)

Closes #6896

See merge request OpenMW/openmw!2221
This commit is contained in:
psi29a 2022-08-01 08:05:27 +00:00
commit 861f1d5303
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -145,6 +145,7 @@
Bug #6849: ImageButton texture is not scaled properly Bug #6849: ImageButton texture is not scaled properly
Bug #6869: Hits queue stagger during swing animation Bug #6869: Hits queue stagger during swing animation
Bug #6895: Removing a negative number of items from a script, makes the script terminate with an error Bug #6895: Removing a negative number of items from a script, makes the script terminate with an error
Bug #6896: Sounds played using PlaySound3D are cut off as the emitter leaves the cell
Bug #6898: Accessing the Quick Inventory menu does not work while in menu mode Bug #6898: Accessing the Quick Inventory menu does not work while in menu mode
Bug #6901: Morrowind.exe soul gem usage discrepancy Bug #6901: Morrowind.exe soul gem usage discrepancy
Bug #6909: Using enchanted items has no animation Bug #6909: Using enchanted items has no animation

6
apps/openmw/mwworld/scene.cpp
View File

@ -926,7 +926,11 @@ namespace MWWorld
void Scene::removeObjectFromScene (const Ptr& ptr, bool keepActive) void Scene::removeObjectFromScene (const Ptr& ptr, bool keepActive)
{ {
MWBase::Environment::get().getMechanicsManager()->remove (ptr, keepActive); MWBase::Environment::get().getMechanicsManager()->remove (ptr, keepActive);
MWBase::Environment::get().getSoundManager()->stopSound3D (ptr); // You'd expect the sounds attached to the object to be stopped here
// because the object is nowhere to be heard, but in Morrowind, they're not.
// They're still stopped when the cell is unloaded
// or if the player moves away far from the object's position.
// Todd Howard, Who art in Bethesda, hallowed be Thy name.
MWBase::Environment::get().getLuaManager()->objectRemovedFromScene(ptr); MWBase::Environment::get().getLuaManager()->objectRemovedFromScene(ptr);
if (const auto object = mPhysics->getObject(ptr)) if (const auto object = mPhysics->getObject(ptr))
{ {