mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-04-16 08:42:23 +00:00
Merge branch 'hopskipanimjump' into 'master'
Keep running scripts until the menu pauses the game Closes #8056 See merge request OpenMW/openmw!4243
This commit is contained in:
commit
1c71f12d4e
@ -245,7 +245,7 @@ bool OMW::Engine::frame(unsigned frameNumber, float frametime)
|
|||||||
|
|
||||||
if (mStateManager->getState() != MWBase::StateManager::State_NoGame)
|
if (mStateManager->getState() != MWBase::StateManager::State_NoGame)
|
||||||
{
|
{
|
||||||
if (!mWindowManager->containsMode(MWGui::GM_MainMenu))
|
if (!mWindowManager->containsMode(MWGui::GM_MainMenu) || !paused)
|
||||||
{
|
{
|
||||||
if (mWorld->getScriptsEnabled())
|
if (mWorld->getScriptsEnabled())
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user