mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 22:15:32 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-11-29 09:34:41 +01:00
commit 20a076bdba
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwgui/messagebox.cpp
View file

@ -117,8 +117,11 @@ namespace MWGui
bool MessageBoxManager::createInteractiveMessageBox (const std::string& message, const std::vector<std::string>& buttons) bool MessageBoxManager::createInteractiveMessageBox (const std::string& message, const std::vector<std::string>& buttons)
{ {
if(mInterMessageBoxe != NULL) { if (mInterMessageBoxe != NULL)
throw std::runtime_error("There is a message box already"); {
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); mInterMessageBoxe = new InteractiveMessageBox(*this, message, buttons);

2
apps/openmw/mwworld/weather.cpp
View file

@ -627,7 +627,7 @@ void WeatherManager::update(float duration, bool paused)
MWBase::World& world = *MWBase::Environment::get().getWorld(); MWBase::World& world = *MWBase::Environment::get().getWorld();
TimeStamp time = world.getTimeStamp(); TimeStamp time = world.getTimeStamp();
if(!paused) if(!paused || mFastForward)
{ {
// Add new transitions when either the player's current external region changes. // Add new transitions when either the player's current external region changes.
std::string playerRegion = Misc::StringUtils::lowerCase(player.getCell()->getCell()->mRegion); std::string playerRegion = Misc::StringUtils::lowerCase(player.getCell()->getCell()->mRegion);