Merge remote-tracking branch 'scrawl/unstack_script'

9 years ago · 379d13c7b9
parent 7e7215b3b3 91bf5ae237
commit 379d13c7b9
1 changed files with 5 additions and 1 deletions
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@ -140,7 +140,11 @@ void MWWorld::ContainerStore::unstack(const Ptr &ptr, const Ptr& container)
 {
    if (ptr.getRefData().getCount() <= 1)
        return;
-    addNewStack(ptr, ptr.getRefData().getCount()-1);
+    MWWorld::ContainerStoreIterator it = addNewStack(ptr, ptr.getRefData().getCount()-1);
+    const std::string script = it->getClass().getScript(*it);
+    if (!script.empty())
+        MWBase::Environment::get().getWorld()->getLocalScripts().add(script, *it);
+
    remove(ptr, ptr.getRefData().getCount()-1, container);
 }