mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 03:35:27 +00:00
Code Issues Projects Releases Wiki Activity

Warn about adding a local script twice (Bug #2806)

Browse Source
This commit is contained in:
scrawl 2016-02-03 16:06:25 +01:00
parent aa9905b0eb
commit 187d2bccda
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/openmw/mwworld/localscripts.cpp
View File

@ -110,6 +110,14 @@ void MWWorld::LocalScripts::add (const std::string& scriptName, const Ptr& ptr)
{ {
ptr.getRefData().setLocals (*script); ptr.getRefData().setLocals (*script);
for (std::list<std::pair<std::string, Ptr> >::iterator iter = mScripts.begin(); iter!=mScripts.end(); ++iter)
if (iter->second==ptr)
{
std::cout << "warning, tried to add local script twice for " << ptr.getCellRef().getRefId() << std::endl;
remove(ptr);
break;
}
mScripts.push_back (std::make_pair (scriptName, ptr)); mScripts.push_back (std::make_pair (scriptName, ptr));
} }
catch (const std::exception& exception) catch (const std::exception& exception)