Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-13 14:06:42 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #2228 from Capostrophic/mainmenu

Browse source 
Fix main menu toggling again
This commit is contained in:
Bret Curtis 2019-03-09 10:27:09 +01:00 • committed by GitHub
commit 048cfdfac6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

31
apps/openmw/mwinput/inputmanagerimp.cpp
View file

@ -1149,18 +1149,14 @@ namespace MWInput
return; return;
} }
bool state = MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame; bool inGame = MWBase::Environment::get().getStateManager()->getState() != MWBase::StateManager::State_NoGame;
MWGui::GuiMode mode = MWBase::Environment::get().getWindowManager()->getMode(); MWGui::GuiMode mode = MWBase::Environment::get().getWindowManager()->getMode();
if (mode == MWGui::GM_MainMenu || mode == MWGui::GM_Settings) if ((inGame && mode == MWGui::GM_MainMenu) || mode == MWGui::GM_Settings)
{
MWBase::Environment::get().getWindowManager()->popGuiMode(); MWBase::Environment::get().getWindowManager()->popGuiMode();
}
if(state || mode == MWGui::GM_MainMenu) if (inGame && mode != MWGui::GM_MainMenu)
return; MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_MainMenu);
MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_MainMenu);
} }
void InputManager::toggleOptionsMenu() void InputManager::toggleOptionsMenu()
@ -1172,20 +1168,13 @@ namespace MWInput
} }
MWGui::GuiMode mode = MWBase::Environment::get().getWindowManager()->getMode(); MWGui::GuiMode mode = MWBase::Environment::get().getWindowManager()->getMode();
bool state = MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame; bool inGame = MWBase::Environment::get().getStateManager()->getState() != MWBase::StateManager::State_NoGame;
if (mode == MWGui::GM_Settings)
{
MWBase::Environment::get().getWindowManager()->popGuiMode();
return;
}
else if (mode == MWGui::GM_MainMenu && !state)
{
MWBase::Environment::get().getWindowManager()->popGuiMode();
}
else if (mode == MWGui::GM_MainMenu)
return;
MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Settings); if ((inGame && mode == MWGui::GM_MainMenu) || mode == MWGui::GM_Settings)
MWBase::Environment::get().getWindowManager()->popGuiMode();
if (inGame && mode != MWGui::GM_Settings)
MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Settings);
} }
void InputManager::quickLoad() { void InputManager::quickLoad() {