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

Improve exception handling when starting a new game from the main menu

Browse source
This commit is contained in:
scrawl 2015-06-15 16:19:05 +02:00
parent d7a4a9fd66
commit 07937c741a
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/openmw/mwstate/statemanagerimp.cpp
View file

@ -139,11 +139,28 @@ void MWState::StateManager::newGame (bool bypass)
if (!bypass)
MWBase::Environment::get().getWindowManager()->setNewGame (true);
MWBase::Environment::get().getScriptManager()->getGlobalScripts().addStartup();
try
{
MWBase::Environment::get().getScriptManager()->getGlobalScripts().addStartup();
MWBase::Environment::get().getWorld()->startNewGame (bypass);
MWBase::Environment::get().getWorld()->startNewGame (bypass);
mState = State_Running;
mState = State_Running;
}
catch (std::exception& e)
{
std::stringstream error;
error << "Failed to start new game: " << e.what();
std::cerr << error.str() << std::endl;
cleanup (true);
MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
std::vector<std::string> buttons;
buttons.push_back("#{sOk}");
MWBase::Environment::get().getWindowManager()->interactiveMessageBox(error.str(), buttons);
}
}
void MWState::StateManager::endGame()