mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-25 03:40:40 +00:00
Code Issues Projects Releases Wiki Activity

Fix GUI regressions

Browse Source
This commit is contained in:
scrawl 2017-10-03 22:07:56 +00:00
parent a795aa7685
commit 433028e8d7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/openmw/mwgui/dialogue.cpp
View File

@ -390,6 +390,7 @@ namespace MWGui
{ {
// No greetings found. The dialogue window should not be shown. // No greetings found. The dialogue window should not be shown.
// If this is a companion, we must show the companion window directly (used by BM_bear_be_unique). // If this is a companion, we must show the companion window directly (used by BM_bear_be_unique).
MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Dialogue);
if (isCompanion()) if (isCompanion())
MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Companion, mPtr); MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Companion, mPtr);
return; return;

2
apps/openmw/mwgui/windowmanagerimp.cpp
View File

@ -606,7 +606,7 @@ namespace MWGui
mMap->setVisible(false); mMap->setVisible(false);
mStatsWindow->setVisible(false); mStatsWindow->setVisible(false);
mSpellWindow->setVisible(false); mSpellWindow->setVisible(false);
mInventoryWindow->setVisible(getMode() == GM_Container || getMode() == GM_Barter); mInventoryWindow->setVisible(getMode() == GM_Container || getMode() == GM_Barter || getMode() == GM_Companion);
} }
GuiMode mode = mGuiModes.back(); GuiMode mode = mGuiModes.back();