From 0a60bde83406b7dbbf34a24b57f066ecbb834511 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 6 Aug 2010 22:20:20 +0200
Subject: [PATCH] added insertIntoContainer function to class hierarchy

---
 apps/openmw/CMakeLists.txt            |  1 +
 apps/openmw/mwclass/apparatus.cpp     |  8 +++++++
 apps/openmw/mwclass/apparatus.hpp     |  4 ++++
 apps/openmw/mwclass/armor.cpp         |  8 +++++++
 apps/openmw/mwclass/armor.hpp         |  4 ++++
 apps/openmw/mwclass/book.cpp          |  8 +++++++
 apps/openmw/mwclass/book.hpp          |  4 ++++
 apps/openmw/mwclass/clothing.cpp      |  8 +++++++
 apps/openmw/mwclass/clothing.hpp      |  4 ++++
 apps/openmw/mwclass/containerutil.hpp | 31 +++++++++++++++++++++++++++
 apps/openmw/mwclass/ingredient.cpp    |  8 +++++++
 apps/openmw/mwclass/ingredient.hpp    |  4 ++++
 apps/openmw/mwclass/light.cpp         |  8 +++++++
 apps/openmw/mwclass/light.hpp         |  4 ++++
 apps/openmw/mwclass/lockpick.cpp      |  8 +++++++
 apps/openmw/mwclass/lockpick.hpp      |  4 ++++
 apps/openmw/mwclass/misc.cpp          |  8 +++++++
 apps/openmw/mwclass/misc.hpp          |  4 ++++
 apps/openmw/mwclass/potion.cpp        |  8 +++++++
 apps/openmw/mwclass/potion.hpp        |  4 ++++
 apps/openmw/mwclass/probe.cpp         |  8 +++++++
 apps/openmw/mwclass/probe.hpp         |  4 ++++
 apps/openmw/mwclass/repair.cpp        |  8 +++++++
 apps/openmw/mwclass/repair.hpp        |  4 ++++
 apps/openmw/mwclass/weapon.cpp        |  8 +++++++
 apps/openmw/mwclass/weapon.hpp        |  4 ++++
 apps/openmw/mwworld/class.cpp         |  7 +++++-
 apps/openmw/mwworld/class.hpp         |  5 +++++
 28 files changed, 187 insertions(+), 1 deletion(-)
 create mode 100644 apps/openmw/mwclass/containerutil.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index c9112b0ee..c41ffb50b 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -141,6 +141,7 @@ set(GAMECLASS_HEADER
     mwclass/probe.hpp
     mwclass/repair.hpp
     mwclass/static.hpp
+    mwclass/containerutil.hpp
     )
 source_group(apps\\openmw\\mwclass FILES ${GAMECLASS} ${GAMECLASS_HEADER})
 
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 066eacd3f..fb2080ded 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -7,6 +7,8 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "containerutil.hpp"
+
 namespace MWClass
 {
     std::string Apparatus::getName (const MWWorld::Ptr& ptr) const
@@ -17,6 +19,12 @@ namespace MWClass
         return ref->base->name;
     }
 
+    void Apparatus::insertIntoContainer (const MWWorld::Ptr& ptr,
+        MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
+    {
+        insertIntoContainerStore (ptr, containerStore.appas);
+    }
+
     std::string Apparatus::getScript (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Apparatus, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index 7b3ccff6a..16d41a34a 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -13,6 +13,10 @@ namespace MWClass
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
 
+            virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
+                MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
+            ///< Insert into a containe
+
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 786868c81..4c0550362 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -7,6 +7,8 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "containerutil.hpp"
+
 namespace MWClass
 {
     std::string Armor::getName (const MWWorld::Ptr& ptr) const
@@ -30,6 +32,12 @@ namespace MWClass
         return ref->base->data.health;
     }
 
+    void Armor::insertIntoContainer (const MWWorld::Ptr& ptr,
+        MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
+    {
+        insertIntoContainerStore (ptr, containerStore.armors);
+    }
+
     std::string Armor::getScript (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index ebae75a9f..8b6c6e163 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -19,6 +19,10 @@ namespace MWClass
             virtual int getItemMaxHealth (const MWWorld::Ptr& ptr) const;
             ///< Return item max health or throw an exception, if class does not have item health
 
+            virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
+                MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
+            ///< Insert into a containe
+
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index 9c0a48409..8faef5494 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -7,6 +7,8 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "containerutil.hpp"
+
 namespace MWClass
 {
     std::string Book::getName (const MWWorld::Ptr& ptr) const
@@ -17,6 +19,12 @@ namespace MWClass
         return ref->base->name;
     }
 
+    void Book::insertIntoContainer (const MWWorld::Ptr& ptr,
+        MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
+    {
+        insertIntoContainerStore (ptr, containerStore.books);
+    }
+
     std::string Book::getScript (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index d45f569b5..c79545d55 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -13,6 +13,10 @@ namespace MWClass
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
 
+            virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
+                MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
+            ///< Insert into a containe
+
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 2c0d76fb3..f1c769cd4 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -7,6 +7,8 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "containerutil.hpp"
+
 namespace MWClass
 {
     std::string Clothing::getName (const MWWorld::Ptr& ptr) const
@@ -17,6 +19,12 @@ namespace MWClass
         return ref->base->name;
     }
 
+    void Clothing::insertIntoContainer (const MWWorld::Ptr& ptr,
+        MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
+    {
+        insertIntoContainerStore (ptr, containerStore.clothes);
+    }
+
     std::string Clothing::getScript (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index 09b66b92d..bd57f7849 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -13,6 +13,10 @@ namespace MWClass
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
 
+            virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
+                MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
+            ///< Insert into a containe
+
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
diff --git a/apps/openmw/mwclass/containerutil.hpp b/apps/openmw/mwclass/containerutil.hpp
new file mode 100644
index 000000000..5f89983ac
--- /dev/null
+++ b/apps/openmw/mwclass/containerutil.hpp
@@ -0,0 +1,31 @@
+#ifndef GAME_MWCLASS_CONTAINERUTIL_H
+#define GAME_MWCLASS_CONTAINERUTIL_H
+
+#include <components/esm_store/cell_store.hpp>
+
+#include "../mwworld/ptr.hpp"
+#include "../mwworld/containerstore.hpp"
+
+namespace MWClass
+{
+    template<typename T>
+    void insertIntoContainerStore (const MWWorld::Ptr& ptr,
+        ESMS::CellRefList<T, MWWorld::RefData>& containerStore)
+    {
+        if (!ptr.isEmpty())
+        {
+            // TODO check stacking
+
+            ESMS::LiveCellRef<T, MWWorld::RefData> cellRef;
+
+            cellRef.base = ptr.get<T>()->base;
+            cellRef.ref = ptr.getCellRef();
+            cellRef.mData = ptr.getRefData();
+
+            containerStore.list.push_back (cellRef);
+
+        }
+    }
+}
+
+#endif
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 81d19b2fa..7389ec5a7 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -7,6 +7,8 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "containerutil.hpp"
+
 namespace MWClass
 {
     std::string Ingredient::getName (const MWWorld::Ptr& ptr) const
@@ -17,6 +19,12 @@ namespace MWClass
         return ref->base->name;
     }
 
+    void Ingredient::insertIntoContainer (const MWWorld::Ptr& ptr,
+        MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
+    {
+        insertIntoContainerStore (ptr, containerStore.ingreds);
+    }
+
     std::string Ingredient::getScript (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index c2edd9484..8e1e14198 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -13,6 +13,10 @@ namespace MWClass
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
 
+            virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
+                MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
+            ///< Insert into a containe
+
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 98e0b01b4..405aa2745 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -7,6 +7,8 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "containerutil.hpp"
+
 namespace MWClass
 {
     std::string Light::getName (const MWWorld::Ptr& ptr) const
@@ -20,6 +22,12 @@ namespace MWClass
         return ref->base->name;
     }
 
+    void Light::insertIntoContainer (const MWWorld::Ptr& ptr,
+        MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
+    {
+        insertIntoContainerStore (ptr, containerStore.lights);
+    }
+
     std::string Light::getScript (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 08c3ddf7c..9627d5918 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -13,6 +13,10 @@ namespace MWClass
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
 
+            virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
+                MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
+            ///< Insert into a containe
+
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index ce57e0c99..7062a0367 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -7,6 +7,8 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "containerutil.hpp"
+
 namespace MWClass
 {
     std::string Lockpick::getName (const MWWorld::Ptr& ptr) const
@@ -17,6 +19,12 @@ namespace MWClass
         return ref->base->name;
     }
 
+    void Lockpick::insertIntoContainer (const MWWorld::Ptr& ptr,
+        MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
+    {
+        insertIntoContainerStore (ptr, containerStore.lockpicks);
+    }
+
     std::string Lockpick::getScript (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Tool, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index e009e9fdd..d9c8147e9 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -13,6 +13,10 @@ namespace MWClass
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
 
+            virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
+                MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
+            ///< Insert into a containe
+
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index dda21aaa7..2d6614776 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -7,6 +7,8 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "containerutil.hpp"
+
 namespace MWClass
 {
     std::string Misc::getName (const MWWorld::Ptr& ptr) const
@@ -17,6 +19,12 @@ namespace MWClass
         return ref->base->name;
     }
 
+    void Misc::insertIntoContainer (const MWWorld::Ptr& ptr,
+        MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
+    {
+        insertIntoContainerStore (ptr, containerStore.miscItems);
+    }
+
     std::string Misc::getScript (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Misc, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index 526235aa0..ec61c5f3e 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -13,6 +13,10 @@ namespace MWClass
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
 
+            virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
+                MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
+            ///< Insert into a containe
+
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index f8e9ee0a0..b368f5cb2 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -7,6 +7,8 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "containerutil.hpp"
+
 namespace MWClass
 {
     std::string Potion::getName (const MWWorld::Ptr& ptr) const
@@ -17,6 +19,12 @@ namespace MWClass
         return ref->base->name;
     }
 
+    void Potion::insertIntoContainer (const MWWorld::Ptr& ptr,
+        MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
+    {
+        insertIntoContainerStore (ptr, containerStore.potions);
+    }
+
     std::string Potion::getScript (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Potion, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index c851d1b4e..ff1408533 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -13,6 +13,10 @@ namespace MWClass
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
 
+            virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
+                MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
+            ///< Insert into a containe
+
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 3c22e4c7f..19f9ac8b2 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -7,6 +7,8 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "containerutil.hpp"
+
 namespace MWClass
 {
     std::string Probe::getName (const MWWorld::Ptr& ptr) const
@@ -17,6 +19,12 @@ namespace MWClass
         return ref->base->name;
     }
 
+    void Probe::insertIntoContainer (const MWWorld::Ptr& ptr,
+        MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
+    {
+        insertIntoContainerStore (ptr, containerStore.probes);
+    }
+
     std::string Probe::getScript (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Probe, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index 84e93d1ce..cf77700c7 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -13,6 +13,10 @@ namespace MWClass
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
 
+            virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
+                MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
+            ///< Insert into a containe
+
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index f22b8607a..463daedfd 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -7,6 +7,8 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "containerutil.hpp"
+
 namespace MWClass
 {
     std::string Repair::getName (const MWWorld::Ptr& ptr) const
@@ -17,6 +19,12 @@ namespace MWClass
         return ref->base->name;
     }
 
+    void Repair::insertIntoContainer (const MWWorld::Ptr& ptr,
+        MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
+    {
+        insertIntoContainerStore (ptr, containerStore.repairs);
+    }
+
     std::string Repair::getScript (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Repair, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index 803e21d51..c9619fb74 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -13,6 +13,10 @@ namespace MWClass
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
 
+            virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
+                MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
+            ///< Insert into a containe
+
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index a7fce960c..471ae2634 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -7,6 +7,8 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "containerutil.hpp"
+
 namespace MWClass
 {
     std::string Weapon::getName (const MWWorld::Ptr& ptr) const
@@ -30,6 +32,12 @@ namespace MWClass
         return ref->base->data.health;
     }
 
+    void Weapon::insertIntoContainer (const MWWorld::Ptr& ptr,
+        MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
+    {
+        insertIntoContainerStore (ptr, containerStore.weapons);
+    }
+
     std::string Weapon::getScript (const MWWorld::Ptr& ptr) const
     {
         ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index 01b6f8e13..1321fc962 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -19,6 +19,10 @@ namespace MWClass
             virtual int getItemMaxHealth (const MWWorld::Ptr& ptr) const;
             ///< Return item max health or throw an exception, if class does not have item health
 
+            virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
+                MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
+            ///< Insert into a containe
+
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index f3b231974..85e5140ea 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -44,7 +44,12 @@ namespace MWWorld
     ContainerStore<RefData>& Class::getContainerStore (const Ptr& ptr) const
     {
         throw std::runtime_error ("class does not have a container store");
-	}
+    }
+
+    void Class::insertIntoContainer (const Ptr& ptr, ContainerStore<RefData>& containerStore) const
+    {
+        throw std::runtime_error ("class does not support inserting into a container");
+    }
 
     std::string Class::getScript (const Ptr& ptr) const
     {
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 86345edd5..28d96d69f 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -64,6 +64,11 @@ namespace MWWorld
             ///< Return container store or throw an exception, if class does not have a
             /// container store (default implementation: throw an exceoption)
 
+            virtual void insertIntoContainer (const Ptr& ptr, ContainerStore<RefData>& containerStore)
+                const;
+            ///< Insert into a container or throw an exception, if class does not support inserting into
+            /// a container.
+
             virtual std::string getScript (const Ptr& ptr) const;
             ///< Return name of the script attached to ptr (default implementation: return an empty
             /// string).