mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-18 13:12:50 +00:00
Code Issues Projects Releases Wiki Activity

fix for potential script problem during saved game loading

Browse Source
This commit is contained in:
Marc Zinnschlag 2014-09-22 10:12:07 +02:00
parent 5c8ef842b6
commit aa7fc8ee47
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/openmw/mwworld/livecellref.cpp
View File

@ -29,10 +29,20 @@ void MWWorld::LiveCellRefBase::loadImp (const ESM::ObjectState& state)
if (!scriptId.empty()) if (!scriptId.empty())
{ {
if (const ESM::Script* script = MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().search (scriptId)) if (const ESM::Script* script = MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().search (scriptId))
{
try
{ {
mData.setLocals (*script); mData.setLocals (*script);
mData.getLocals().read (state.mLocals, scriptId); mData.getLocals().read (state.mLocals, scriptId);
} }
catch (const std::exception& exception)
{
std::cerr
<< "failed to load state for local script " << scriptId
<< " because an exception has been thrown: " << exception.what()
<< std::endl;
}
}
} }
} }