Changeset 10609 for code/branches/SciptableControllerFS15/src/orxonox/controllers/ControllerDirector.cc

Timestamp:

Oct 4, 2015, 11:51:01 AM (9 years ago)

Author:

landauf

Message:

merged r10499 from presentationFS15 into this branch

Location:

code/branches/SciptableControllerFS15

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/ControllerDirector.cc (modified) (3 diffs)

code/branches/SciptableControllerFS15/src/orxonox/controllers/ControllerDirector.cc

@@ -41 +41 @@
     {
         SUPER(ControllerDirector, XMLPort, xmlelement, mode);
+        XMLPortParam(ControllerDirector, "scriptname", setScriptName, getScriptName, xmlelement, mode).defaultValues("testscript");
 
         orxout(verbose)<< "ControllerDirector::XMLPort " 
@@ -83 +84 @@
        else
          return;
-       
+
        /* Set up a luastate to use for running the scripts */
        LuaState * ls = new LuaState();
@@ -98 +99 @@
         * variable "newctrlid" defined, which means it can make use of it.
         */
-
-       ls->doFile("testscript.lua");
+       std::string scr = this->scriptname_ + ".lua";
+       ls->doFile(scr);
 
        /* Increase the controller ID so we have a different one for