mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 08:41:35 +00:00
Code Issues Releases Wiki Activity

Make adding non-existent global script more forgiving (bug #5364)

Browse source
This commit is contained in:
Capostrophic 2020-04-10 22:19:06 +03:00
parent f27e299025
commit feeab8a335
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,6 +1,7 @@
0.47.0 0.47.0
------ ------
Bug #5364: Script fails/stops if trying to startscript an unknown script
0.46.0 0.46.0
------ ------

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

@ -28,7 +28,7 @@ namespace MWScript
if (iter==mScripts.end()) if (iter==mScripts.end())
{ {
if (const ESM::Script *script = mStore.get<ESM::Script>().find (name)) if (const ESM::Script *script = mStore.get<ESM::Script>().search(name))
{ {
GlobalScriptDesc desc; GlobalScriptDesc desc;
desc.mRunning = true; desc.mRunning = true;
@ -37,6 +37,10 @@ namespace MWScript
mScripts.insert (std::make_pair (name, desc)); mScripts.insert (std::make_pair (name, desc));
} }
else
{
Log(Debug::Error) << "Failed to add global script " << name << ": script record not found";
}
} }
else if (!iter->second.mRunning) else if (!iter->second.mRunning)
{ {