From 28c580d2805ee7a88a6a00b2fae573eac3f8807f Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Sun, 20 Jan 2013 15:43:52 +0000
Subject: [PATCH] disabling and enabling containers causes scripts on contents
 to be disabled and enabled accordingly

---
 apps/openmw/mwworld/worldimp.cpp | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 716cd6e96..bd48875e7 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -406,6 +406,24 @@ namespace MWWorld
         if (!reference.getRefData().isEnabled())
         {
             reference.getRefData().enable();
+            
+            /* run scripts on container contents */
+            if( reference.getTypeName()==typeid (ESM::Container).name() ||
+                reference.getTypeName()==typeid (ESM::NPC).name() ||
+                reference.getTypeName()==typeid (ESM::Creature).name())
+            {
+                MWWorld::ContainerStore& container = MWWorld::Class::get(reference).getContainerStore(reference);
+                for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
+                {
+                    std::string script = MWWorld::Class::get(*it).getScript(*it);
+                    if(script != "")
+                    {
+                        MWWorld::Ptr item = *it;
+                        item.mCell = reference.getCell();
+                        mLocalScripts.add (script, item);
+                    }
+                }
+            }
 
             if(mWorldScene->getActiveCells().find (reference.getCell()) != mWorldScene->getActiveCells().end() && reference.getRefData().getCount())
                 mWorldScene->addObjectToScene (reference);
@@ -417,6 +435,23 @@ namespace MWWorld
         if (reference.getRefData().isEnabled())
         {
             reference.getRefData().disable();
+            
+            /* remove scripts on container contents */
+            if( reference.getTypeName()==typeid (ESM::Container).name() ||
+                reference.getTypeName()==typeid (ESM::NPC).name() ||
+                reference.getTypeName()==typeid (ESM::Creature).name())
+            {
+                MWWorld::ContainerStore& container = MWWorld::Class::get(reference).getContainerStore(reference);
+                for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
+                {
+                    std::string script = MWWorld::Class::get(*it).getScript(*it);
+                    if(script != "")
+                    {
+                        MWWorld::Ptr item = *it;
+                        mLocalScripts.remove (item);
+                    }
+                }
+            }
 
             if(mWorldScene->getActiveCells().find (reference.getCell())!=mWorldScene->getActiveCells().end() && reference.getRefData().getCount())
                 mWorldScene->removeObjectFromScene (reference);