From c138e00aa250b1cca9cd8484b085df6830218685 Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Sun, 13 Jan 2013 17:05:12 +0000
Subject: [PATCH] objects scripts are now stopped when they are removed from a
 container

---
 apps/openmw/mwbase/world.hpp         |  4 ++++
 apps/openmw/mwworld/localscripts.cpp | 14 ++++++++++++++
 apps/openmw/mwworld/localscripts.hpp |  3 +++
 apps/openmw/mwworld/refdata.cpp      |  6 ++++++
 apps/openmw/mwworld/worldimp.cpp     |  5 +++++
 apps/openmw/mwworld/worldimp.hpp     |  3 +++
 6 files changed, 35 insertions(+)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index a576912c0..2ce7ce2c7 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -45,6 +45,7 @@ namespace MWWorld
     class Ptr;
     class TimeStamp;
     class ESMStore;
+    class RefData;
 }
 
 namespace MWBase
@@ -138,6 +139,9 @@ namespace MWBase
 
             virtual std::string getCurrentCellName() const = 0;
 
+            virtual void removeRefScript (MWWorld::RefData *ref) = 0;
+            //< Remove the script attached to ref from mLocalScripts
+
             virtual MWWorld::Ptr getPtr (const std::string& name, bool activeOnly) = 0;
             ///< Return a pointer to a liveCellRef with the given name.
             /// \param activeOnly do non search inactive cells.
diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index 9c9131008..2fa0d4086 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -146,6 +146,20 @@ void MWWorld::LocalScripts::clearCell (Ptr::CellStore *cell)
     }
 }
 
+void MWWorld::LocalScripts::remove (RefData *ref)
+{
+    for (std::list<std::pair<std::string, Ptr> >::iterator iter = mScripts.begin();
+        iter!=mScripts.end(); ++iter)
+        if (&(iter->second.getRefData()) == ref)
+        {
+            if (iter==mIter)
+                ++mIter;
+
+            mScripts.erase (iter);
+            break;
+        }
+}
+
 void MWWorld::LocalScripts::remove (const Ptr& ptr)
 {
     for (std::list<std::pair<std::string, Ptr> >::iterator iter = mScripts.begin();
diff --git a/apps/openmw/mwworld/localscripts.hpp b/apps/openmw/mwworld/localscripts.hpp
index 028dcdeda..840243fff 100644
--- a/apps/openmw/mwworld/localscripts.hpp
+++ b/apps/openmw/mwworld/localscripts.hpp
@@ -10,6 +10,7 @@ namespace MWWorld
 {
     struct ESMStore;
     class CellStore;
+    class RefData;
 
     /// \brief List of active local scripts
     class LocalScripts
@@ -47,6 +48,8 @@ namespace MWWorld
 
             void clearCell (CellStore *cell);
             ///< Remove all scripts belonging to \a cell.
+            
+            void remove (RefData *ref);
 
             void remove (const Ptr& ptr);
             ///< Remove script for given reference (ignored if reference does not have a scirpt listed).
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 5630bfd5c..4be287810 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -6,6 +6,9 @@
 #include "customdata.hpp"
 #include "cellstore.hpp"
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
 namespace MWWorld
 {
     void RefData::copy (const RefData& refData)
@@ -107,6 +110,9 @@ namespace MWWorld
 
     void RefData::setCount (int count)
     {
+        if(count == 0)
+            MWBase::Environment::get().getWorld()->removeRefScript(this);
+        
         mCount = count;
     }
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index f49b4bf9b..716cd6e96 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -341,6 +341,11 @@ namespace MWWorld
         return name;
     }
 
+    void World::removeRefScript (MWWorld::RefData *ref)
+    {
+        mLocalScripts.remove (ref);
+    }
+
     Ptr World::getPtr (const std::string& name, bool activeOnly)
     {
         // the player is always in an active cell.
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 7e89c1d87..905e6fd96 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -172,6 +172,9 @@ namespace MWWorld
             virtual std::vector<std::string> getGlobals () const;
             
             virtual std::string getCurrentCellName () const;
+            
+            virtual void removeRefScript (MWWorld::RefData *ref);
+            //< Remove the script attached to ref from mLocalScripts
 
             virtual Ptr getPtr (const std::string& name, bool activeOnly);
             ///< Return a pointer to a liveCellRef with the given name.