krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Remove 'visibility mask' gui feature which did not end up being useful

Browse source
This commit is contained in:
scrawl 2017-10-04 17:08:09 +02:00
parent 7c68ed04b2
commit 49a0922f1b
2 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -613,18 +613,18 @@ namespace MWGui
mInventoryWindow->setTrading(mode == GM_Barter); 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) 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) switch (mode)
{ {
@ -2063,12 +2063,7 @@ namespace MWGui
void WindowManager::GuiModeState::update(bool visible) void WindowManager::GuiModeState::update(bool visible)
{ {
for (unsigned int i=0; i<mWindows.size(); ++i) for (unsigned int i=0; i<mWindows.size(); ++i)
{ mWindows[i]->setVisible(visible);
bool visibilityMask = true;
if (i < mVisibilityMask.size())
visibilityMask = mVisibilityMask[i];
mWindows[i]->setVisible(visible && visibilityMask);
}
} }
} }

1
apps/openmw/mwgui/windowmanagerimp.hpp
View file

@ -477,7 +477,6 @@ namespace MWGui
void update(bool visible); void update(bool visible);
std::vector<WindowBase*> mWindows; std::vector<WindowBase*> mWindows;
std::vector<bool> mVisibilityMask; // optional, may be used to temporarily exclude windows from this mode.
std::string mCloseSound; std::string mCloseSound;
std::string mOpenSound; std::string mOpenSound;