From 49a0922f1b4b26c5dd421ab326fb6529b55d79eb Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Wed, 4 Oct 2017 17:08:09 +0200
Subject: [PATCH] Remove 'visibility mask' gui feature which did not end up
 being useful

---
 apps/openmw/mwgui/windowmanagerimp.cpp | 29 +++++++++++---------------
 apps/openmw/mwgui/windowmanagerimp.hpp |  1 -
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index a9ca9bd19..9a7a7437a 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -613,18 +613,18 @@ namespace MWGui
 
         mInventoryWindow->setTrading(mode == GM_Barter);
 
-        // For the inventory mode, compute the effective set of windows to show.
-        // This is controlled both by what windows the
-        // user has opened/closed (the 'shown' variable) and by what
-        // windows we are allowed to show (the 'allowed' var.)
-        int eff = mShown & mAllowed & ~mForceHidden;
-        mGuiModeStates[GM_Inventory].mVisibilityMask.resize(4);
-        mGuiModeStates[GM_Inventory].mVisibilityMask[0] = eff & GW_Map;
-        mGuiModeStates[GM_Inventory].mVisibilityMask[1] = eff & GW_Inventory;
-        mGuiModeStates[GM_Inventory].mVisibilityMask[2] = eff & GW_Magic;
-        mGuiModeStates[GM_Inventory].mVisibilityMask[3] = eff & GW_Stats;
         if (getMode() == GM_Inventory)
-            mGuiModeStates[GM_Inventory].update(true);
+        {
+            // For the inventory mode, compute the effective set of windows to show.
+            // This is controlled both by what windows the
+            // user has opened/closed (the 'shown' variable) and by what
+            // windows we are allowed to show (the 'allowed' var.)
+            int eff = mShown & mAllowed & ~mForceHidden;
+            mMap->setVisible(eff & GW_Map);
+            mInventoryWindow->setVisible(eff & GW_Inventory);
+            mSpellWindow->setVisible(eff & GW_Magic);
+            mStatsWindow->setVisible(eff & GW_Stats);
+        }
 
         switch (mode)
         {
@@ -2063,12 +2063,7 @@ namespace MWGui
     void WindowManager::GuiModeState::update(bool visible)
     {
         for (unsigned int i=0; i<mWindows.size(); ++i)
-        {
-            bool visibilityMask = true;
-            if (i < mVisibilityMask.size())
-                visibilityMask = mVisibilityMask[i];
-            mWindows[i]->setVisible(visible && visibilityMask);
-        }
+            mWindows[i]->setVisible(visible);
     }
 
 }
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index bdd2aa094..c8bc8d21e 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -477,7 +477,6 @@ namespace MWGui
         void update(bool visible);
 
         std::vector<WindowBase*> mWindows;
-        std::vector<bool> mVisibilityMask; // optional, may be used to temporarily exclude windows from this mode.
 
         std::string mCloseSound;
         std::string mOpenSound;