Changeset 10622 in orxonox.OLD for trunk/src/lib/script_engine/script_manager.cc

Timestamp:

Apr 6, 2007, 6:54:15 PM (17 years ago)

Author:

snellen

Message:

merged scriptimprovements back to trunk

File:

• trunk/src/lib/script_engine/script_manager.cc (modified) (3 diffs)

trunk/src/lib/script_engine/script_manager.cc

@@ -25 +25 @@
 
 #include "script.h"
-#include "tools/script_trigger.h"
+#include "script_triggers/script_trigger.h"
 #include "luaincl.h"
 #include "loading/load_param_xml.h"
+#include "util/loading/factory.h"
 
 
@@ -50 +51 @@
 {
   BaseObject::loadParams(root);
-  {
-    LoadParamXML(root, "Scripts", this, ScriptManager, createScripts);
 
-    LoadParamXML(root, "ScriptTriggers", this, ScriptManager, createTriggers);
-  } // make shure that the loading process is finished
+  LoadParamXML(root, "Scripts", this, ScriptManager, createScripts);
 
-  // fill the scripts and triggers (doing that on runtime is very slow!)
+  LoadParamXML(root, "ScriptTriggers", this, ScriptManager, createTriggers);
+
 }
 
@@ -85 +84 @@
 void ScriptManager::createTriggers(const TiXmlElement* triggers)
 {
+   
   LOAD_PARAM_START_CYCLE(triggers, object);
   {
-    new ScriptTrigger(object);
+   Factory::fabricate(object);
   }
   LOAD_PARAM_END_CYCLE(object);