Ticket #3238: trigger-STmode.patch

source/simulation2/Simulation2.cpp

@@ -103 +103 @@
 
     static bool LoadDefaultScripts(CComponentManager& componentManager, std::set<VfsPath>* loadedScripts);
     static bool LoadScripts(CComponentManager& componentManager, std::set<VfsPath>* loadedScripts, const VfsPath& path);
-    static bool LoadTriggerScripts(CComponentManager& componentManager, JS::HandleValue mapSettings, std::set<VfsPath>* loadedScripts);
+    static bool LoadTriggerScripts(CComponentManager& componentManager, JS::HandleValue mapSettings, std::set<VfsPath>* loadedScripts, bool acceptMultipleLoad = false);
     Status ReloadChangedFile(const VfsPath& path);
 
     static Status ReloadChangedFileCB(void* param, const VfsPath& path)
@@ -199 +199 @@
     return ok;
 }
 
-bool CSimulation2Impl::LoadTriggerScripts(CComponentManager& componentManager, JS::HandleValue mapSettings, std::set<VfsPath>* loadedScripts)
+bool CSimulation2Impl::LoadTriggerScripts(CComponentManager& componentManager, JS::HandleValue mapSettings, std::set<VfsPath>* loadedScripts, bool acceptMultipleLoad)
 {
     bool ok = true;
     if (componentManager.GetScriptInterface().HasProperty(mapSettings, "TriggerScripts"))
@@ -211 +211 @@
             std::string scriptName = "maps/" + scriptNames[i];
             if (loadedScripts)
             {
-                if (loadedScripts->find(scriptName) != loadedScripts->end())
+                if (!acceptMultipleLoad && loadedScripts->find(scriptName) != loadedScripts->end())
                     return true;
                 loadedScripts->insert(scriptName);
             }
@@ -371 +371 @@
         ResetComponentState(secondaryComponentManager, false, false);
 
         // Load the trigger scripts after we have loaded the simulation.
+        // Make sure scripts are not discarded because already loaded in the first simulation.
         {
             JSContext* cx2 = secondaryComponentManager.GetScriptInterface().GetContext();
             JSAutoRequest rq2(cx2);
@@ -377 +378 @@
             JS::RootedValue mapSettingsCloned(cx2, 
                 secondaryComponentManager.GetScriptInterface().CloneValueFromOtherContext(
                     scriptInterface, m_MapSettings));
-            ENSURE(LoadTriggerScripts(secondaryComponentManager, mapSettingsCloned, &m_LoadedScripts));
+            ENSURE(LoadTriggerScripts(secondaryComponentManager, mapSettingsCloned, &m_LoadedScripts, true));
         }
 
         // Load the map into the secondary simulation