Changeset 5660 for code/branches/resource2/src/core/Loader.cc

Timestamp:

Aug 18, 2009, 12:06:41 PM (15 years ago)

Author:

rgrieder

Message:

Added bLuaSupport_ to XMLFile so we can load the resource locations without lua. And therefore LuaState can access its init script via resources.
Also fixed a problem in the LevelManager with level loading.

File:

• code/branches/resource2/src/core/Loader.cc (modified) (2 diffs)

code/branches/resource2/src/core/Loader.cc

@@ -122 +122 @@
         Loader::currentMask_s = file->getMask() * mask;
 
-        // Use the LuaState to replace the XML tags (calls our function)
-        scoped_ptr<LuaState> luaState(new LuaState());
-        luaState->setIncludeParser(&Loader::replaceLuaTags);
-        luaState->includeFile(file->getFilename(), file->getResourceGroup(), false);
-        //luaState->doString(luaInput);
+        std::string xmlInput;
+        if (file->getLuaSupport())
+        {
+            // Use the LuaState to replace the XML tags (calls our function)
+            scoped_ptr<LuaState> luaState(new LuaState());
+            luaState->setIncludeParser(&Loader::replaceLuaTags);
+            luaState->includeFile(file->getFilename(), file->getResourceGroup(), false);
+            xmlInput = luaState->getOutput().str();
+        }
+        else
+        {
+            shared_ptr<ResourceInfo> info = Resource::getInfo(file->getFilename(), file->getResourceGroup());
+            if (info == NULL)
+            {
+                COUT(1) << "Error: Could not find XML file '" << file->getFilename() << "'." << std::endl;
+                return false;
+            }
+            xmlInput = Resource::open(file->getFilename(), file->getResourceGroup())->getAsString();
+        }
 
         try
@@ -134 +148 @@
 
             ticpp::Document xmlfile(file->getFilename());
-            xmlfile.Parse(luaState->getOutput().str(), true);
+            xmlfile.Parse(xmlInput, true);
 
             ticpp::Element rootElement;