Changeset 2026 for code/branches/objecthierarchy/src/core/LuaBind.cc

Timestamp:

Oct 28, 2008, 3:06:23 PM (17 years ago)

Author:

landauf

Message:

lua include is now looking for files in the media directory

File:

• code/branches/objecthierarchy/src/core/LuaBind.cc (modified) (1 diff)

code/branches/objecthierarchy/src/core/LuaBind.cc

@@ -123 +123 @@
       isRunning_ = true;
       int error = 0;
-      std::string init = "local scr = orxonox.LuaBind:getInstance()\nlocal debug = print\nprint = function(s)\nscr:luaPrint(s)\nend\ninclude = function(f)\nfile = io.open(f)\ncontent = file:read(\"*a\")\nfile:close()\nsource = scr:replaceLuaTags(content)\ndebug(source)\nassert(loadstring(source))()\nend\n";
+      std::string init = "local scr = orxonox.LuaBind:getInstance()\nlocal debug = print\nprint = function(s)\nscr:luaPrint(s)\nend\ninclude = function(f)\nfile = assert(io.open(\"" + this->includePath_ + "\"..\"/\"..f))\ncontent = file:read(\"*a\")\nfile:close()\nsource = scr:replaceLuaTags(content)\nassert(loadstring(source))()\nend\n";
       init += luaSource_;
   #if LUA_VERSION_NUM == 501