implemented take action

apps/openmw/CMakeLists.txt

@@ -83,6 +83,7 @@ set(GAMEWORLD
     mwworld/globals.cpp
     mwworld/class.cpp
     mwworld/actionteleport.cpp
+    mwworld/actiontake.cpp
     mwworld/containerutil.cpp
     )
 set(GAMEWORLD_HEADER
@@ -95,6 +96,7 @@ set(GAMEWORLD_HEADER
     mwworld/action.hpp
     mwworld/nullaction.hpp
     mwworld/actionteleport.hpp
+    mwworld/actiontake.hpp
     mwworld/containerstore.hpp
     mwworld/manualref.hpp
     mwworld/containerutil.hpp

apps/openmw/mwclass/apparatus.cpp

@@ -6,6 +6,7 @@
 #include <components/esm_store/cell_store.hpp>
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/actiontake.hpp"
 
 #include "containerutil.hpp"
 
@@ -19,6 +20,13 @@ namespace MWClass
         return ref->base->name;
     }
 
+    boost::shared_ptr<MWWorld::Action> Apparatus::activate (const MWWorld::Ptr& ptr,
+        const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const
+    {
+        return boost::shared_ptr<MWWorld::Action> (
+            new MWWorld::ActionTake (ptr));
+    }
+
     void Apparatus::insertIntoContainer (const MWWorld::Ptr& ptr,
         MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
     {

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 boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+                const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const;
+            ///< Generate action for activation
+
             virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
                 MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
             ///< Insert into a containe

apps/openmw/mwclass/armor.cpp

@@ -6,6 +6,7 @@
 #include <components/esm_store/cell_store.hpp>
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/actiontake.hpp"
 
 #include "containerutil.hpp"
 
@@ -19,6 +20,13 @@ namespace MWClass
         return ref->base->name;
     }
 
+    boost::shared_ptr<MWWorld::Action> Armor::activate (const MWWorld::Ptr& ptr,
+        const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const
+    {
+        return boost::shared_ptr<MWWorld::Action> (
+            new MWWorld::ActionTake (ptr));
+    }
+
     bool Armor::hasItemHealth (const MWWorld::Ptr& ptr) const
     {
         return true;

apps/openmw/mwclass/armor.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 boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+                const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const;
+            ///< Generate action for activation
+
             virtual bool hasItemHealth (const MWWorld::Ptr& ptr) const;
             ///< \return Item health data available?
 

apps/openmw/mwclass/book.cpp

@@ -6,6 +6,7 @@
 #include <components/esm_store/cell_store.hpp>
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/actiontake.hpp"
 
 #include "containerutil.hpp"
 
@@ -19,6 +20,15 @@ namespace MWClass
         return ref->base->name;
     }
 
+    boost::shared_ptr<MWWorld::Action> Book::activate (const MWWorld::Ptr& ptr,
+        const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const
+    {
+        // TODO implement reading
+
+        return boost::shared_ptr<MWWorld::Action> (
+            new MWWorld::ActionTake (ptr));
+    }
+
     void Book::insertIntoContainer (const MWWorld::Ptr& ptr,
         MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
     {

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 boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+                const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const;
+            ///< Generate action for activation
+
             virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
                 MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
             ///< Insert into a containe

apps/openmw/mwclass/clothing.cpp

@@ -6,6 +6,7 @@
 #include <components/esm_store/cell_store.hpp>
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/actiontake.hpp"
 
 #include "containerutil.hpp"
 
@@ -19,6 +20,13 @@ namespace MWClass
         return ref->base->name;
     }
 
+    boost::shared_ptr<MWWorld::Action> Clothing::activate (const MWWorld::Ptr& ptr,
+        const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const
+    {
+        return boost::shared_ptr<MWWorld::Action> (
+            new MWWorld::ActionTake (ptr));
+    }
+
     void Clothing::insertIntoContainer (const MWWorld::Ptr& ptr,
         MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
     {

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 boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+                const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const;
+            ///< Generate action for activation
+
             virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
                 MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
             ///< Insert into a containe

apps/openmw/mwclass/ingredient.cpp

@@ -6,6 +6,7 @@
 #include <components/esm_store/cell_store.hpp>
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/actiontake.hpp"
 
 #include "containerutil.hpp"
 
@@ -19,6 +20,13 @@ namespace MWClass
         return ref->base->name;
     }
 
+    boost::shared_ptr<MWWorld::Action> Ingredient::activate (const MWWorld::Ptr& ptr,
+        const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const
+    {
+        return boost::shared_ptr<MWWorld::Action> (
+            new MWWorld::ActionTake (ptr));
+    }
+
     void Ingredient::insertIntoContainer (const MWWorld::Ptr& ptr,
         MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
     {

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 boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+                const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const;
+            ///< Generate action for activation
+
             virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
                 MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
             ///< Insert into a containe

apps/openmw/mwclass/light.cpp

@@ -6,6 +6,8 @@
 #include <components/esm_store/cell_store.hpp>
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/actiontake.hpp"
+#include "../mwworld/nullaction.hpp"
 
 #include "containerutil.hpp"
 
@@ -22,6 +24,19 @@ namespace MWClass
         return ref->base->name;
     }
 
+    boost::shared_ptr<MWWorld::Action> Light::activate (const MWWorld::Ptr& ptr,
+        const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const
+    {
+        ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
+            ptr.get<ESM::Light>();
+
+        if (!(ref->base->data.flags & ESM::Light::Carry))
+            return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
+
+        return boost::shared_ptr<MWWorld::Action> (
+            new MWWorld::ActionTake (ptr));
+    }
+
     void Light::insertIntoContainer (const MWWorld::Ptr& ptr,
         MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
     {

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 boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+                const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const;
+            ///< Generate action for activation
+
             virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
                 MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
             ///< Insert into a containe

apps/openmw/mwclass/lockpick.cpp

@@ -6,6 +6,7 @@
 #include <components/esm_store/cell_store.hpp>
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/actiontake.hpp"
 
 #include "containerutil.hpp"
 
@@ -19,6 +20,13 @@ namespace MWClass
         return ref->base->name;
     }
 
+    boost::shared_ptr<MWWorld::Action> Lockpick::activate (const MWWorld::Ptr& ptr,
+        const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const
+    {
+        return boost::shared_ptr<MWWorld::Action> (
+            new MWWorld::ActionTake (ptr));
+    }
+
     void Lockpick::insertIntoContainer (const MWWorld::Ptr& ptr,
         MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
     {

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 boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+                const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const;
+            ///< Generate action for activation
+
             virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
                 MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
             ///< Insert into a containe

apps/openmw/mwclass/misc.cpp

@@ -6,6 +6,7 @@
 #include <components/esm_store/cell_store.hpp>
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/actiontake.hpp"
 
 #include "containerutil.hpp"
 
@@ -19,6 +20,13 @@ namespace MWClass
         return ref->base->name;
     }
 
+    boost::shared_ptr<MWWorld::Action> Misc::activate (const MWWorld::Ptr& ptr,
+        const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const
+    {
+        return boost::shared_ptr<MWWorld::Action> (
+            new MWWorld::ActionTake (ptr));
+    }
+
     void Misc::insertIntoContainer (const MWWorld::Ptr& ptr,
         MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
     {

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 boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+                const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const;
+            ///< Generate action for activation
+
             virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
                 MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
             ///< Insert into a containe

apps/openmw/mwclass/potion.cpp

@@ -6,6 +6,7 @@
 #include <components/esm_store/cell_store.hpp>
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/actiontake.hpp"
 
 #include "containerutil.hpp"
 
@@ -19,6 +20,13 @@ namespace MWClass
         return ref->base->name;
     }
 
+    boost::shared_ptr<MWWorld::Action> Potion::activate (const MWWorld::Ptr& ptr,
+        const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const
+    {
+        return boost::shared_ptr<MWWorld::Action> (
+            new MWWorld::ActionTake (ptr));
+    }
+
     void Potion::insertIntoContainer (const MWWorld::Ptr& ptr,
         MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
     {

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 boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+                const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const;
+            ///< Generate action for activation
+
             virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
                 MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
             ///< Insert into a containe

apps/openmw/mwclass/probe.cpp

@@ -6,6 +6,7 @@
 #include <components/esm_store/cell_store.hpp>
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/actiontake.hpp"
 
 #include "containerutil.hpp"
 
@@ -19,6 +20,13 @@ namespace MWClass
         return ref->base->name;
     }
 
+    boost::shared_ptr<MWWorld::Action> Probe::activate (const MWWorld::Ptr& ptr,
+        const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const
+    {
+        return boost::shared_ptr<MWWorld::Action> (
+            new MWWorld::ActionTake (ptr));
+    }
+
     void Probe::insertIntoContainer (const MWWorld::Ptr& ptr,
         MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
     {

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 boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+                const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const;
+            ///< Generate action for activation
+
             virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
                 MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
             ///< Insert into a containe

apps/openmw/mwclass/repair.cpp

@@ -6,6 +6,7 @@
 #include <components/esm_store/cell_store.hpp>
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/actiontake.hpp"
 
 #include "containerutil.hpp"
 
@@ -19,6 +20,13 @@ namespace MWClass
         return ref->base->name;
     }
 
+    boost::shared_ptr<MWWorld::Action> Repair::activate (const MWWorld::Ptr& ptr,
+        const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const
+    {
+        return boost::shared_ptr<MWWorld::Action> (
+            new MWWorld::ActionTake (ptr));
+    }
+
     void Repair::insertIntoContainer (const MWWorld::Ptr& ptr,
         MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
     {

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 boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+                const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const;
+            ///< Generate action for activation
+
             virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
                 MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
             ///< Insert into a containe

apps/openmw/mwclass/weapon.cpp

@@ -6,6 +6,7 @@
 #include <components/esm_store/cell_store.hpp>
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/actiontake.hpp"
 
 #include "containerutil.hpp"
 
@@ -19,6 +20,13 @@ namespace MWClass
         return ref->base->name;
     }
 
+    boost::shared_ptr<MWWorld::Action> Weapon::activate (const MWWorld::Ptr& ptr,
+        const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const
+    {
+        return boost::shared_ptr<MWWorld::Action> (
+            new MWWorld::ActionTake (ptr));
+    }
+
     bool Weapon::hasItemHealth (const MWWorld::Ptr& ptr) const
     {
         return true;

apps/openmw/mwclass/weapon.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 boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
+                const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const;
+            ///< Generate action for activation
+
             virtual bool hasItemHealth (const MWWorld::Ptr& ptr) const;
             ///< \return Item health data available?
 

apps/openmw/mwrender/cell.hpp

@@ -3,31 +3,33 @@
 
 #include <string>
 
-namespace MWRender 
+namespace MWRender
 {
     class CellRender
     {
-        public: 
-    
+        public:
+
             virtual ~CellRender() {};
-    
+
             /// Make the cell visible. Load the cell if necessary.
             virtual void show() = 0;
-            
+
             /// Remove the cell from rendering, but don't remove it from
             /// memory.
-            virtual void hide() = 0; 
-            
+            virtual void hide() = 0;
+
             /// Destroy all rendering objects connected with this cell.
             virtual void destroy() = 0;
-            
+
             /// Make the reference with the given handle visible.
             virtual void enable (const std::string& handle) = 0;
-            
+
             /// Make the reference with the given handle invisible.
             virtual void disable (const std::string& handle) = 0;
+
+            /// Remove the reference with the given handle permanently from the scene.
+            virtual void deleteObject (const std::string& handle) = 0;
     };
 }
 
 #endif
-

apps/openmw/mwrender/interior.cpp

@@ -237,6 +237,16 @@ void InteriorCellRender::disable (const std::string& handle)
         scene.getMgr()->getSceneNode (handle)->setVisible (false);
 }
 
+void InteriorCellRender::deleteObject (const std::string& handle)
+{
+    if (!handle.empty())
+    {
+        Ogre::SceneNode *node = scene.getMgr()->getSceneNode (handle);
+        node->removeAndDestroyAllChildren();
+        scene.getMgr()->destroySceneNode (node);
+    }
+}
+
 // Magic function from the internets. Might need this later.
 /*
 void Scene::DestroyAllAttachedMovableObjects( SceneNode* i_pSceneNode )

apps/openmw/mwrender/interior.hpp

@@ -99,11 +99,13 @@ namespace MWRender
 
     /// Make the reference with the given handle visible.
     virtual void enable (const std::string& handle);
-    
+
     /// Make the reference with the given handle invisible.
-    virtual void disable (const std::string& handle); 
+    virtual void disable (const std::string& handle);
+
+    /// Remove the reference with the given handle permanently from the scene.
+    virtual void deleteObject (const std::string& handle);
   };
 }
 
 #endif
-

apps/openmw/mwworld/actiontake.cpp

@@ -0,0 +1,23 @@
+
+#include "actiontake.hpp"
+
+#include "class.hpp"
+#include "environment.hpp"
+#include "world.hpp"
+
+namespace MWWorld
+{
+    ActionTake::ActionTake (const MWWorld::Ptr& object) : mObject (object) {}
+
+    void ActionTake::execute (Environment& environment)
+    {
+        // insert into player's inventory
+        MWWorld::Ptr player = environment.mWorld->getPtr ("player", true);
+
+        MWWorld::Class::get (mObject).insertIntoContainer (mObject,
+            MWWorld::Class::get (player).getContainerStore (player));
+
+        // remove from world
+        environment.mWorld->deleteObject (mObject);
+    }
+}

apps/openmw/mwworld/actiontake.hpp

@@ -0,0 +1,21 @@
+#ifndef GAME_MWWORLD_ACTIONTAKE_H
+#define GAME_MWWORLD_ACTIONTAKE_H
+
+#include "action.hpp"
+#include "ptr.hpp"
+
+namespace MWWorld
+{
+    class ActionTake : public Action
+    {
+            MWWorld::Ptr mObject;
+
+        public:
+
+            ActionTake (const MWWorld::Ptr& object);
+
+            virtual void execute (Environment& environment);
+    };
+}
+
+#endif

apps/openmw/mwworld/world.cpp

@@ -611,4 +611,25 @@ namespace MWWorld
 
         return result.first;
     }
+
+    void World::deleteObject (Ptr ptr)
+    {
+        if (ptr.getRefData().getCount()>0)
+        {
+            ptr.getRefData().setCount (0);
+
+            if (MWRender::CellRender *render = searchRender (ptr.getCell()))
+            {
+                render->deleteObject (ptr.getRefData().getHandle());
+                ptr.getRefData().setHandle ("");
+
+                if (mActiveCells.find (ptr.getCell())!=mActiveCells.end() &&
+                    (ptr.getType()==typeid (ESMS::LiveCellRef<ESM::NPC, RefData>) ||
+                    ptr.getType()==typeid (ESMS::LiveCellRef<ESM::Creature, RefData>)))
+                {
+                    mEnvironment.mMechanicsManager->removeActor (ptr);
+                }
+            }
+        }
+    }
 }

apps/openmw/mwworld/world.hpp

@@ -134,6 +134,8 @@ namespace MWWorld
 
             std::string getFacedHandle();
             ///< Return handle of the object the player is looking at
+
+            void deleteObject (Ptr ptr);
     };
 }