mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 06:53:53 +00:00
Code Issues Releases Wiki Activity

do not crash on exceptions while adding startup scripts

Browse source
This commit is contained in:
Marc Zinnschlag 2014-10-31 11:02:42 +01:00
parent 4fa0bf63c5
commit ac58dd735b
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/openmw/mwscript/globalscripts.cpp
View file

@ -90,13 +90,32 @@ namespace MWScript
void GlobalScripts::addStartup()
{
addScript ("main");
// make list of global scripts to be added
std::vector<std::string> scripts;
scripts.push_back ("main");
for (MWWorld::Store<ESM::StartScript>::iterator iter =
mStore.get<ESM::StartScript>().begin();
iter != mStore.get<ESM::StartScript>().end(); ++iter)
{
addScript (iter->mScript);
scripts.push_back (iter->mScript);
}
// add scripts
for (std::vector<std::string>::const_iterator iter (scripts.begin());
iter!=scripts.end(); ++iter)
{
try
{
addScript (*iter);
}
catch (const std::exception& exception)
{
std::cerr
<< "Failed to add start script " << *iter << " because an exception has "
<< "been thrown: " << exception.what() << std::endl;
}
}
}