Merge pull request #2772 from Capostrophic/startscript

Make adding non-existent global script more forgiving (bug #5364)
pull/578/head
Andrei Kortunov 5 years ago committed by GitHub
commit f75417e627
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,6 +1,7 @@
0.47.0 0.47.0
------ ------
Bug #5364: Script fails/stops if trying to startscript an unknown script
Bug #5367: Selecting a spell on an enchanted item per hotkey always plays the equip sound Bug #5367: Selecting a spell on an enchanted item per hotkey always plays the equip sound
Bug #5369: Spawnpoint in the Grazelands doesn't produce oversized creatures Bug #5369: Spawnpoint in the Grazelands doesn't produce oversized creatures
Feature #5362: Show the soul gems' trapped soul in count dialog Feature #5362: Show the soul gems' trapped soul in count dialog

@ -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)
{ {

Loading…
Cancel
Save