From fd48c1d6f4312ca96a401f1cc6341835133a50d8 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 7 Sep 2015 21:32:28 +0200
Subject: [PATCH] Make the Equip script function "use" items (drink potion, use
 alchemy, etc)

---
 apps/openmw/mwbase/windowmanager.hpp         |  3 +++
 apps/openmw/mwgui/quickkeysmenu.cpp          |  6 ++----
 apps/openmw/mwgui/spellwindow.cpp            |  3 +--
 apps/openmw/mwgui/windowmanagerimp.cpp       |  6 ++++++
 apps/openmw/mwgui/windowmanagerimp.hpp       |  3 +++
 apps/openmw/mwscript/containerextensions.cpp | 12 +++++++-----
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index f8bf157c2..fb7eca4a3 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -148,6 +148,9 @@ namespace MWBase
             virtual MWGui::ConfirmationDialog* getConfirmationDialog() = 0;
             virtual MWGui::TradeWindow* getTradeWindow() = 0;
 
+            /// Make the player use an item, while updating GUI state accordingly
+            virtual void useItem(const MWWorld::Ptr& item) = 0;
+
             virtual void updateSpellWindow() = 0;
 
             virtual void setConsoleSelectedObject(const MWWorld::Ptr& object) = 0;
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index f1e474a2f..f2ae8dd83 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -21,8 +21,6 @@
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
-#include "../mwgui/inventorywindow.hpp"
-
 #include "itemselection.hpp"
 #include "spellview.hpp"
 #include "itemwidget.hpp"
@@ -311,7 +309,7 @@ namespace MWGui
         else if (type == Type_Item)
         {
             MWWorld::Ptr item = *button->getUserData<MWWorld::Ptr>();
-            MWBase::Environment::get().getWindowManager()->getInventoryWindow()->useItem(item);
+            MWBase::Environment::get().getWindowManager()->useItem(item);
             MWWorld::ContainerStoreIterator rightHand = store.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
             // change draw state only if the item is in player's right hand
             if (rightHand != store.end() && item == *rightHand)
@@ -337,7 +335,7 @@ namespace MWGui
             // equip, if it can be equipped
             if (!item.getClass().getEquipmentSlots(item).first.empty())
             {
-                MWBase::Environment::get().getWindowManager()->getInventoryWindow()->useItem(item);
+                MWBase::Environment::get().getWindowManager()->useItem(item);
 
                 // make sure that item was successfully equipped
                 if (!store.isEquipped(item))
diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp
index 68a604256..8422bb33f 100644
--- a/apps/openmw/mwgui/spellwindow.cpp
+++ b/apps/openmw/mwgui/spellwindow.cpp
@@ -18,7 +18,6 @@
 #include "../mwmechanics/actorutil.hpp"
 
 #include "spellicons.hpp"
-#include "inventorywindow.hpp"
 #include "confirmationdialog.hpp"
 #include "spellview.hpp"
 
@@ -104,7 +103,7 @@ namespace MWGui
         if (!alreadyEquipped
             && !item.getClass().getEquipmentSlots(item).first.empty())
         {
-            MWBase::Environment::get().getWindowManager()->getInventoryWindow()->useItem(item);
+            MWBase::Environment::get().getWindowManager()->useItem(item);
             // make sure that item was successfully equipped
             if (!store.isEquipped(item))
                 return;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 365f2c7a1..90a5f7481 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1327,6 +1327,12 @@ namespace MWGui
     MWGui::ConfirmationDialog* WindowManager::getConfirmationDialog() { return mConfirmationDialog; }
     MWGui::TradeWindow* WindowManager::getTradeWindow() { return mTradeWindow; }
 
+    void WindowManager::useItem(const MWWorld::Ptr &item)
+    {
+        if (mInventoryWindow)
+            mInventoryWindow->useItem(item);
+    }
+
     bool WindowManager::isAllowed (GuiWindow wnd) const
     {
         return (mAllowed & wnd) != 0;
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 336a2a19a..a1f76683e 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -173,6 +173,9 @@ namespace MWGui
     virtual MWGui::ConfirmationDialog* getConfirmationDialog();
     virtual MWGui::TradeWindow* getTradeWindow();
 
+    /// Make the player use an item, while updating GUI state accordingly
+    virtual void useItem(const MWWorld::Ptr& item);
+
     virtual void updateSpellWindow();
 
     virtual void setConsoleSelectedObject(const MWWorld::Ptr& object);
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 20ca2b580..ec14add9a 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -191,11 +191,13 @@ namespace MWScript
                     if (it == invStore.end())
                         throw std::runtime_error("Item to equip not found");
 
-                    MWWorld::ActionEquip action (*it);
-                    action.execute(ptr);
-
-                    if (ptr == MWMechanics::getPlayer() && !ptr.getClass().getScript(ptr).empty())
-                        ptr.getRefData().getLocals().setVarByInt(ptr.getClass().getScript(ptr), "onpcequip", 1);
+                    if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+                        MWBase::Environment::get().getWindowManager()->useItem(*it);
+                    else
+                    {
+                        boost::shared_ptr<MWWorld::Action> action = it->getClass().use(*it);
+                        action->execute(ptr);
+                    }
                 }
         };