From bcbfa5fe1e97696a96794b0b55d3ec8b427a1212 Mon Sep 17 00:00:00 2001
From: rexelion <rexelion@users.noreply.github.com>
Date: Sat, 4 Nov 2017 00:38:33 +0000
Subject: [PATCH] prevent activation, leave the rest to the script

---
 apps/openmw/mwgui/inventorywindow.cpp | 9 +++------
 apps/openmw/mwworld/actiontake.cpp    | 3 ---
 apps/openmw/mwworld/refdata.cpp       | 5 -----
 apps/openmw/mwworld/refdata.hpp       | 2 --
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 1e9f534d6..063bc5c01 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -653,6 +653,9 @@ namespace MWGui
         if (object.getClass().getName(object) == "") // objects without name presented to user can never be picked up
             return;
 
+        if (!object.getRefData().activate())
+            return;
+
         int count = object.getRefData().getCount();
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
@@ -663,12 +666,6 @@ namespace MWGui
         // add to player inventory
         // can't use ActionTake here because we need an MWWorld::Ptr to the newly inserted object
         MWWorld::Ptr newObject = *player.getClass().getContainerStore (player).add (object, object.getRefData().getCount(), player);
-        
-        if (object.getRefData().hasSuppressActivate()) // if Flag_SuppressActivate is set, script that contains OnActivate is attached to the item
-        {
-            newObject.getRefData().onActivate(); // set the flag_SuppressActivate flag for the new item
-            newObject.getRefData().activate();
-        }
 
         // remove from world
         MWBase::Environment::get().getWorld()->deleteObject (object);
diff --git a/apps/openmw/mwworld/actiontake.cpp b/apps/openmw/mwworld/actiontake.cpp
index 52e30c8ac..d858859a6 100644
--- a/apps/openmw/mwworld/actiontake.cpp
+++ b/apps/openmw/mwworld/actiontake.cpp
@@ -14,9 +14,6 @@ namespace MWWorld
 
     void ActionTake::executeImp (const Ptr& actor)
     {
-        //No need to do anything if moving items from the player's inventory back into player's inventory
-        if (actor == MWBase::Environment::get().getWorld()->getPlayerPtr() && getTarget().getCell() == 0)
-            return;
         MWBase::Environment::get().getMechanicsManager()->itemTaken(
                     actor, getTarget(), MWWorld::Ptr(), getTarget().getRefData().getCount());
         MWWorld::Ptr newitem = *actor.getClass().getContainerStore (actor).add (getTarget(), getTarget().getRefData().getCount(), actor);
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 95b0fb3e0..f6fa3556f 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -192,11 +192,6 @@ namespace MWWorld
         return mEnabled;
     }
 
-    bool RefData::hasSuppressActivate()
-    {
-        return mFlags & Flag_SuppressActivate;
-    }
-
     void RefData::enable()
     {
         if (!mEnabled)
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index 4dfa9e91c..75eec6742 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -111,8 +111,6 @@ namespace MWWorld
 
             bool isEnabled() const;
 
-            bool hasSuppressActivate();
-
             void enable();
 
             void disable();