mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-29 15:13:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #3238, SetGlobal 'TriggerHelper' called multiple times

Browse Source 
This was SVN commit r16713.
This commit is contained in:
trompetin17
2015-06-03 20:34:59 +00:00
parent 65e442eea5
commit 6506bc20cb
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/Simulation2.cpp
+4
View File
@@ -210,7 +210,11 @@ bool CSimulation2Impl::LoadTriggerScripts(CComponentManager& componentManager, J
{ {
std::string scriptName = "maps/" + scriptNames[i]; std::string scriptName = "maps/" + scriptNames[i];
if (loadedScripts) if (loadedScripts)
{
if (loadedScripts->find(scriptName) != loadedScripts->end())
return true;
loadedScripts->insert(scriptName); loadedScripts->insert(scriptName);
}
LOGMESSAGE("Loading trigger script '%s'", scriptName.c_str()); LOGMESSAGE("Loading trigger script '%s'", scriptName.c_str());
if (!componentManager.LoadScript(scriptName.data())) if (!componentManager.LoadScript(scriptName.data()))
ok = false; ok = false;