mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 17:09:42 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2772 from Capostrophic/startscript

Browse source 
Make adding non-existent global script more forgiving (bug #5364)
This commit is contained in:
Andrei Kortunov 2020-04-13 13:49:33 +04:00 committed by GitHub
commit f75417e627
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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
------
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 #5369: Spawnpoint in the Grazelands doesn't produce oversized creatures
Feature #5362: Show the soul gems' trapped soul in count dialog

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

@ -28,7 +28,7 @@ namespace MWScript
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;
desc.mRunning = true;
@ -37,6 +37,10 @@ namespace MWScript
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)
{