Changeset 8164 in orxonox.OLD

Timestamp:

Jun 5, 2006, 9:20:48 PM (18 years ago)

Author:

snellen

Message:

changes in script manager

Location:

branches/script_engine/src/lib/script_engine

Files:

• script_manager.cc (modified) (2 diffs)
• script_manager.h (modified) (1 diff)

branches/script_engine/src/lib/script_engine/script_manager.cc

@@ -74 +74 @@
   while( script != NULL)
   {
+    { // scope to make the Loadparam work
     LoadParam(script, "file", this, ScriptManager, setCurrentScriptFile)
         .describe("the fileName of the script, that should be loaded into this world")
         .defaultValues("");
+    }
 
     if(!currentScript.name.empty()) // if LoadParam didn't fail... fill the object list with the needed objects
     {
-    object = script->FirstChildElement("object");
+    /*object = script->FirstChildElement("object");
 
     while(object != NULL)
     {
-      addObjectToScript(std::string(object->Value()), currentScript);
+      LoadParam(object, "object", this, ScriptManager, setCurrentScriptFile)
+          .describe("the fileName of the script, that should be loaded into this world")
+          .defaultValues("");
       object = object->NextSiblingElement("object");
     }
+    */
+
+    LOAD_PARAM_START_CYCLE(script, object);
+    {
+      LoadParam_CYCLE(object, "object", this, ScriptManager, addObjectToScript)
+          .describe("The name of an object that is needed by a script");
+    }
+    LOAD_PARAM_END_CYCLE(object);
+
 
     scriptList.push_back(currentScript);
@@ -106 +119 @@
  }
 
-void  ScriptManager::addObjectToScript(const std::string object, LuaScript& script)
+void  ScriptManager::addObjectToScript(const std::string object)
 {
-  if(!objectIsInObjectList(object,script))
-    script.objectList.push_back(object);
+  if(!objectIsInObjectList(object,currentScript))
+    currentScript.objectList.push_back(object);
 }
 

branches/script_engine/src/lib/script_engine/script_manager.h

@@ -39 +39 @@
    void  createScriptList(const TiXmlElement* scripts);
    void  setCurrentScriptFile(const std::string& file);
-   void  addObjectToScript(const std::string object, LuaScript& script);
+   void  addObjectToScript(const std::string object);
 
    bool fileIsInScriptList(const std::string& file);