Merge branch 'lua_hide_main_menu' into 'master'

Assumeru · Assumeru · commit 62d1cdcdac43 · 2025-03-03T15:39:05.000Z
Hide main menu on new and loading game from menu scripts

See merge request OpenMW/openmw!4560
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -757,12 +757,14 @@ void MWState::StateManager::update(float duration)
 
     if (mNewGameRequest)
     {
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_MainMenu);
         newGame();
         mNewGameRequest = false;
     }
 
     if (mLoadRequest)
     {
+        MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_MainMenu);
         loadGame(*mLoadRequest);
         mLoadRequest = std::nullopt;
     }

Original file line number	Diff line number	Diff line change
`@@ -757,12 +757,14 @@ void MWState::StateManager::update(float duration)`
`757`	`757`
`758`	`758`	`if (mNewGameRequest)`
`759`	`759`	`{`
	`760`	`+ MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_MainMenu);`
`760`	`761`	`newGame();`
`761`	`762`	`mNewGameRequest = false;`
`762`	`763`	`}`
`763`	`764`
`764`	`765`	`if (mLoadRequest)`
`765`	`766`	`{`
	`767`	`+ MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_MainMenu);`
`766`	`768`	`loadGame(*mLoadRequest);`
`767`	`769`	`mLoadRequest = std::nullopt;`
`768`	`770`	`}`