From 94a281370f6d4d29d60f1c74f5f8f6a6bebd7554 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Tue, 17 Sep 2019 22:40:51 +0400 Subject: [PATCH] Continue scripts execution after player's death (bug #5166) --- CHANGELOG.md | 3 ++- apps/openmw/engine.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebf884d86..b307e630d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -139,10 +139,11 @@ Bug #5134: Doors rotation by "Lock" console command is inconsistent Bug #5137: Textures with Clamp Mode set to Clamp instead of Wrap are too dark outside the boundaries Bug #5149: Failing lock pick attempts isn't always a crime + Bug #5158: Objects without a name don't fallback to their ID Bug #5159: NiMaterialColorController can only control the diffuse color Bug #5161: Creature companions can't be activated when they are knocked down Bug #5164: Faction owned items handling is incorrect - Bug #5188: Objects without a name don't fallback to their ID + Bug #5166: Scripts still should be executed after player's death Feature #1774: Handle AvoidNode Feature #2229: Improve pathfinding AI Feature #3025: Analogue gamepad movement controls diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index d5ab73213..7c92236ed 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -112,8 +112,8 @@ bool OMW::Engine::frame(float frametime) bool guiActive = mEnvironment.getWindowManager()->isGuiMode(); osg::Timer_t beforeScriptTick = osg::Timer::instance()->tick(); - if (mEnvironment.getStateManager()->getState()== - MWBase::StateManager::State_Running) + if (mEnvironment.getStateManager()->getState()!= + MWBase::StateManager::State_NoGame) { if (!paused) {