mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-30 07:21:12 +00:00
Hide the settings window when any main menu button is pressed
This commit is contained in:
parent
c65f5adfba
commit
7274d825a3
@ -100,10 +100,6 @@ namespace MWGui
|
|||||||
{
|
{
|
||||||
winMgr->removeGuiMode(GM_MainMenu);
|
winMgr->removeGuiMode(GM_MainMenu);
|
||||||
}
|
}
|
||||||
else if (name == "options")
|
|
||||||
{
|
|
||||||
winMgr->toggleSettingsWindow();
|
|
||||||
}
|
|
||||||
else if (name == "credits")
|
else if (name == "credits")
|
||||||
winMgr->playVideo("mw_credits.bik", true);
|
winMgr->playVideo("mw_credits.bik", true);
|
||||||
else if (name == "exitgame")
|
else if (name == "exitgame")
|
||||||
@ -132,17 +128,18 @@ namespace MWGui
|
|||||||
dialog->eventCancelClicked.clear();
|
dialog->eventCancelClicked.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (name == "loadgame" || name == "savegame")
|
||||||
else
|
|
||||||
{
|
{
|
||||||
if (!mSaveGameDialog)
|
if (!mSaveGameDialog)
|
||||||
mSaveGameDialog = std::make_unique<SaveGameDialog>();
|
mSaveGameDialog = std::make_unique<SaveGameDialog>();
|
||||||
if (name == "loadgame")
|
mSaveGameDialog->setLoadOrSave(name == "loadgame");
|
||||||
mSaveGameDialog->setLoadOrSave(true);
|
|
||||||
else if (name == "savegame")
|
|
||||||
mSaveGameDialog->setLoadOrSave(false);
|
|
||||||
mSaveGameDialog->setVisible(true);
|
mSaveGameDialog->setVisible(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (winMgr->isSettingsWindowVisible() || name == "options")
|
||||||
|
{
|
||||||
|
winMgr->toggleSettingsWindow();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainMenu::showBackground(bool show)
|
void MainMenu::showBackground(bool show)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user