From f785659297abf4b23876a875f0da5bdcb0c39ee8 Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Sat, 2 Feb 2013 17:36:12 +0000
Subject: [PATCH] Implemented OnPCAdd special variable

Had to edit OpAddItem in miscextensions.cpp, as local variables were not being initialised
for items added through it.
Does not get reset on drop, as per original morrowind.
---
 apps/openmw/mwscript/containerextensions.cpp |  8 ++++++
 apps/openmw/mwworld/containerstore.cpp       | 28 ++++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 1fa69d1fd..4cce19b86 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -50,6 +50,14 @@ namespace MWScript
                     MWWorld::ManualRef ref (MWBase::Environment::get().getWorld()->getStore(), item);
 
                     ref.getPtr().getRefData().setCount (count);
+                    
+                    // Configure item's script variables
+                    std::string script = MWWorld::Class::get(ref.getPtr()).getScript(ref.getPtr());
+                    if (script != "")
+                    {
+                        const ESM::Script *esmscript = MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().find (script);
+                        ref.getPtr().getRefData().setLocals(*esmscript);
+                    }
 
                     MWWorld::Class::get (ptr).getContainerStore (ptr).add (ref.getPtr());
                 }
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index bca4073b5..31eabb342 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -8,9 +8,11 @@
 #include <boost/algorithm/string.hpp>
 
 #include <components/esm/loadcont.hpp>
+#include <components/compiler/locals.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwbase/scriptmanager.hpp"
 
 #include "manualref.hpp"
 #include "refdata.hpp"
@@ -83,9 +85,31 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& ptr)
         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;
+        {
+            cell = 0; // Items in players inventory have cell set to 0, so their scripts will never be removed
+           
+            // Set OnPCAdd special variable, if it is declared 
+            Compiler::Locals locals = MWBase::Environment::get().getScriptManager()->getLocals(script);
+            int index = locals.getIndex("onpcadd");
+            char type = locals.getType("onpcadd");
+            
+            if(index != -1)
+            {
+                switch(type)
+                {
+                    case 's':
+                        item.mRefData->getLocals().mShorts.at (index) = 1; break;
+                    
+                    case 'l':
+                        item.mRefData->getLocals().mLongs.at (index) = 1; break;
+                    
+                    case 'f':
+                        item.mRefData->getLocals().mFloats.at (index) = 1.0; break;
+                }
+            }
+        }
         else
             cell = player.getCell();