From 31c71c029d9bfb662b1661c0422d6e325682ff1f Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Sun, 20 Jan 2013 17:01:30 +0000
Subject: [PATCH] objects with scripts attached, that are inside containers
 will behave correctly when the container is moved

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

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index ee18e5d953..46c58ecabd 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -685,6 +685,7 @@ namespace MWWorld
             {
                 mWorldScene->removeObjectFromScene (ptr);
                 mLocalScripts.remove (ptr);
+                removeContainerScripts (ptr);
             }
         }
     }
@@ -698,6 +699,8 @@ namespace MWWorld
         CellStore *currCell = ptr.getCell();
         bool isPlayer = ptr == mPlayer->getPlayer();
         bool haveToMove = mWorldScene->isCellActive(*currCell) || isPlayer;
+        
+        removeContainerScripts(ptr);
 
         if (*currCell != newCell)
         {
@@ -725,6 +728,8 @@ namespace MWWorld
                     MWWorld::Ptr copy =
                         MWWorld::Class::get(ptr).copyToCell(ptr, newCell);
 
+                    addContainerScripts(copy, &newCell);
+
                     mRendering->moveObjectToCell(copy, vec, currCell);
 
                     if (MWWorld::Class::get(ptr).isActor())
@@ -1333,6 +1338,7 @@ namespace MWWorld
             if (!script.empty()) {
                 mLocalScripts.add(script, dropped);
             }
+            addContainerScripts(dropped, &cell);
         }
     }