Changeset 999 for code/branches/script/src/orxonox/core/Loader.cc

Timestamp:

Apr 6, 2008, 2:43:12 AM (17 years ago)

Author:

bknecht

Message:

some changes with the script. Made it singleton plus the files were moved into the core.

File:

• code/branches/script/src/orxonox/core/Loader.cc (modified) (3 diffs)

code/branches/script/src/orxonox/core/Loader.cc

@@ -33 +33 @@
 #include "Debug.h"
 #include "CoreIncludes.h"
-#include "../script/Script.h"
+#include "Script.h"
 
 #include "util/tinyxml/ticpp.h"
@@ -110 +110 @@
         // let Lua work this out:
         //Script* lua;
-        Script::loadFile(level->getFile(), true);
+        /*Script::loadFile(level->getFile(), true);
         Script::init(Script::getLuaState());
-        Script::run();
+        Script::run();*/
+        Script* lua = Script::getInstance();
 
         try
@@ -124 +125 @@
             ticpp::Document xmlfile;
             //xmlfile.ToDocument();
-            xmlfile.Parse(*Script::getFileString(), true);
+            xmlfile.Parse(lua->getLuaOutput(), true);
 
             for ( ticpp::Iterator<ticpp::Element> child = xmlfile.FirstChildElement(false); child != child.end(); child++ )