From 4e6f53d6f16572086ad1c0d5455e16ed3ce359af Mon Sep 17 00:00:00 2001
From: rexelion <rexelion@users.noreply.github.com>
Date: Sun, 29 Oct 2017 11:45:17 +0000
Subject: [PATCH] item added to the player and OnActivate is triggered when the
 inventory is closed

---
 apps/openmw/mwgui/inventorywindow.cpp  | 20 ++++++++++++++++++++
 apps/openmw/mwgui/inventorywindow.hpp  |  4 ++++
 apps/openmw/mwgui/windowmanagerimp.cpp |  2 ++
 3 files changed, 26 insertions(+)

diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index b3697008c..8586cfb5b 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -1,6 +1,7 @@
 #include "inventorywindow.hpp"
 
 #include <stdexcept>
+#include <algorithm>
 
 #include <MyGUI_Window.h>
 #include <MyGUI_ImageBox.h>
@@ -149,6 +150,15 @@ namespace MWGui
         mItemView->setModel(NULL);
     }
 
+    void InventoryWindow::activateItems()
+    {
+        for (std::vector<MWWorld::Ptr>::iterator it = mItemsToActivate.begin(); it != mItemsToActivate.end(); it++)
+        {
+            it->getRefData().activate();
+        }
+        mItemsToActivate.clear();
+    }
+
     void InventoryWindow::setGuiMode(GuiMode mode)
     {
         std::string setting = "inventory";
@@ -653,6 +663,16 @@ namespace MWGui
         if (object.getClass().getName(object) == "") // objects without name presented to user can never be picked up
             return;
 
+        std::string scriptName = object.getClass().getScript(object); // Objects that have OnActivte in their script cannot be picked up through inventory
+        if (!scriptName.empty() && MWBase::Environment::get().getScriptManager()->hasOnActivate(scriptName))
+        {
+            if (std::find(mItemsToActivate.begin(), mItemsToActivate.end(), object) == mItemsToActivate.end())
+            {
+                mItemsToActivate.push_back(object);
+            }
+            return;
+        }
+
         int count = object.getRefData().getCount();
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
diff --git a/apps/openmw/mwgui/inventorywindow.hpp b/apps/openmw/mwgui/inventorywindow.hpp
index 5576b52ed..3f88d8822 100644
--- a/apps/openmw/mwgui/inventorywindow.hpp
+++ b/apps/openmw/mwgui/inventorywindow.hpp
@@ -58,6 +58,8 @@ namespace MWGui
 
             void clear();
 
+            void activateItems();
+
             void useItem(const MWWorld::Ptr& ptr);
 
             void setGuiMode(GuiMode mode);
@@ -70,6 +72,8 @@ namespace MWGui
 
             int mSelectedItem;
 
+            std::vector<MWWorld::Ptr> mItemsToActivate;
+
             MWWorld::Ptr mPtr;
 
             MWGui::ItemView* mItemView;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index ccdd6916c..e2a10ccc3 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1171,6 +1171,8 @@ namespace MWGui
             mGuiModeStates[mode].update(false);
             if (!noSound)
                 playSound(mGuiModeStates[mode].mCloseSound);
+            if (mode == GM_Inventory)
+                mInventoryWindow->activateItems(); // Activate cursed items when inventory is closed
         }
 
         if (!mGuiModes.empty())