From c7010623fb419f928fb369b5e93cbcfe39c0e0c8 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 25 May 2012 18:45:17 +0200
Subject: [PATCH] Issue #294: disallowed inventory prevents Talk, Open and Take
 actions

---
 apps/openmw/mwgui/window_manager.hpp | 5 +++++
 apps/openmw/mwworld/actionopen.cpp   | 3 +++
 apps/openmw/mwworld/actiontake.cpp   | 4 ++++
 apps/openmw/mwworld/actiontalk.cpp   | 5 ++++-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/window_manager.hpp b/apps/openmw/mwgui/window_manager.hpp
index c698047fe2..f565c15fac 100644
--- a/apps/openmw/mwgui/window_manager.hpp
+++ b/apps/openmw/mwgui/window_manager.hpp
@@ -133,6 +133,11 @@ namespace MWGui
       updateVisible();
     }
 
+    bool isAllowed(GuiWindow wnd)
+    {
+        return allowed & wnd;
+    }
+
     MWGui::DialogueWindow* getDialogueWindow() {return mDialogueWindow;}
     MWGui::ContainerWindow* getContainerWindow() {return mContainerWindow;}
     MWGui::InventoryWindow* getInventoryWindow() {return mInventoryWindow;}
diff --git a/apps/openmw/mwworld/actionopen.cpp b/apps/openmw/mwworld/actionopen.cpp
index e2c8ec5cf1..dd36487dc9 100644
--- a/apps/openmw/mwworld/actionopen.cpp
+++ b/apps/openmw/mwworld/actionopen.cpp
@@ -16,6 +16,9 @@ namespace MWWorld
 
     void ActionOpen::execute ()
     {
+        if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
+            return;
+
         MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Container);
         MWBase::Environment::get().getWindowManager()->getContainerWindow()->open(mContainer);
     }
diff --git a/apps/openmw/mwworld/actiontake.cpp b/apps/openmw/mwworld/actiontake.cpp
index 384cb3ffe1..9cff42812b 100644
--- a/apps/openmw/mwworld/actiontake.cpp
+++ b/apps/openmw/mwworld/actiontake.cpp
@@ -2,6 +2,7 @@
 #include "actiontake.hpp"
 
 #include "../mwbase/environment.hpp"
+#include "../mwgui/window_manager.hpp"
 
 #include "class.hpp"
 #include "world.hpp"
@@ -13,6 +14,9 @@ namespace MWWorld
 
     void ActionTake::execute()
     {
+        if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
+            return;
+
         // insert into player's inventory
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPtr ("player", true);
 
diff --git a/apps/openmw/mwworld/actiontalk.cpp b/apps/openmw/mwworld/actiontalk.cpp
index b33b788323..b3b6316533 100644
--- a/apps/openmw/mwworld/actiontalk.cpp
+++ b/apps/openmw/mwworld/actiontalk.cpp
@@ -2,7 +2,7 @@
 #include "actiontalk.hpp"
 
 #include "../mwbase/environment.hpp"
-
+#include "../mwgui/window_manager.hpp"
 #include "../mwdialogue/dialoguemanager.hpp"
 
 namespace MWWorld
@@ -11,6 +11,9 @@ namespace MWWorld
 
     void ActionTalk::execute()
     {
+        if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
+            return;
+
         MWBase::Environment::get().getDialogueManager()->startDialogue (mActor);
     }
 }