From 6fc64e8a4e9d374040f29343029ec197f5323cdd Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Sun, 13 Jan 2013 19:49:56 +0000
Subject: [PATCH] scripts run for items added to containers, and scripted items
 in player inv handled correctly

---
 apps/openmw/mwworld/containerstore.cpp | 28 +++++++++++++++++++++++++-
 apps/openmw/mwworld/containerstore.hpp |  1 +
 apps/openmw/mwworld/localscripts.cpp   |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index db4537daf..6884aa6c8 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -15,6 +15,8 @@
 #include "manualref.hpp"
 #include "refdata.hpp"
 #include "class.hpp"
+#include "localscripts.hpp"
+#include "player.hpp"
 
 namespace
 {
@@ -71,6 +73,30 @@ bool MWWorld::ContainerStore::stacks(const Ptr& ptr1, const Ptr& ptr2)
 }
 
 MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& ptr)
+{
+    MWWorld::ContainerStoreIterator it = realAdd(ptr);
+    MWWorld::Ptr item = *it;
+
+    std::string script = MWWorld::Class::get(item).getScript(item);
+    if(script != "")
+    {
+        CellStore *cell;
+
+        Ptr player = MWBase::Environment::get().getWorld ()->getPlayer().getPlayer();
+        // Items in players inventory have cell set to 0, so their scripts will never be removed
+        if(&(MWWorld::Class::get (player).getContainerStore (player)) == this)
+            cell = 0;
+        else
+            cell = player.getCell();
+
+        item.mCell = cell;
+        MWBase::Environment::get().getWorld()->getLocalScripts().add(script, item);
+    }
+
+    return it;
+}
+
+MWWorld::ContainerStoreIterator MWWorld::ContainerStore::realAdd (const Ptr& ptr)
 {
     int type = getType(ptr);
 
@@ -162,7 +188,7 @@ void MWWorld::ContainerStore::fill (const ESM::InventoryList& items, const MWWor
         }
 
         ref.getPtr().getRefData().setCount (std::abs(iter->mCount)); /// \todo implement item restocking (indicated by negative count)
-        add (ref.getPtr());
+        realAdd (ref.getPtr());
     }
 
     flagAsModified();
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index 1297fc53c..e274ee130 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -52,6 +52,7 @@ namespace MWWorld
             int mStateId;
             mutable float mCachedWeight;
             mutable bool mWeightUpToDate;
+            ContainerStoreIterator realAdd (const Ptr& ptr);
 
         public:
 
diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index 2fa0d4086..5ec5ca9b5 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -134,7 +134,7 @@ void MWWorld::LocalScripts::clearCell (Ptr::CellStore *cell)
 
     while (iter!=mScripts.end())
     {
-        if (iter->second.getCell()==cell)
+        if (iter->second.mCell==cell)
         {
             if (iter==mIter)
                ++mIter;