From c9bfe0112084708fb27b47d35af4e133582881a3 Mon Sep 17 00:00:00 2001 From: scrawl Date: Sat, 28 Nov 2015 17:57:35 +0100 Subject: [PATCH 1/2] Fix applying of weather changes after serving a jail sentence --- apps/openmw/mwworld/weather.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp index a5e4db547..afa819121 100644 --- a/apps/openmw/mwworld/weather.cpp +++ b/apps/openmw/mwworld/weather.cpp @@ -627,7 +627,7 @@ void WeatherManager::update(float duration, bool paused) MWBase::World& world = *MWBase::Environment::get().getWorld(); TimeStamp time = world.getTimeStamp(); - if(!paused) + if(!paused || mFastForward) { // Add new transitions when either the player's current external region changes. std::string playerRegion = Misc::StringUtils::lowerCase(player.getCell()->getCell()->mRegion); From db71634a2d66dd6a41a706410463364e90b91c9b Mon Sep 17 00:00:00 2001 From: scrawl Date: Sat, 28 Nov 2015 19:14:47 +0100 Subject: [PATCH 2/2] Allow replacing of interactive message boxes (Fixes #3040) --- apps/openmw/mwgui/messagebox.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp index c647ecaf5..f8ddeba3e 100644 --- a/apps/openmw/mwgui/messagebox.cpp +++ b/apps/openmw/mwgui/messagebox.cpp @@ -117,8 +117,11 @@ namespace MWGui bool MessageBoxManager::createInteractiveMessageBox (const std::string& message, const std::vector& buttons) { - if(mInterMessageBoxe != NULL) { - throw std::runtime_error("There is a message box already"); + if (mInterMessageBoxe != NULL) + { + std::cerr << "Warning: replacing an interactive message box that was not answered yet" << std::endl; + delete mInterMessageBoxe; + mInterMessageBoxe = NULL; } mInterMessageBoxe = new InteractiveMessageBox(*this, message, buttons);