Changeset 2508 for code/trunk

Timestamp:

Dec 17, 2008, 8:43:19 PM (16 years ago)

Author:

rgrieder

Message:

Bugfix in LuaBind.cc

File:

• code/trunk/src/core/LuaBind.cc (modified) (3 diffs)

code/trunk/src/core/LuaBind.cc

@@ -84 +84 @@
     }
 
-    char line[1024];
+    char line[1024*32];
     std::string levelString = "";
 
     while (file.good() && !file.eof())
     {
-      file.getline(line, 1024);
+      file.getline(line, 1024*32);
       levelString += line;
       levelString += "\n";
@@ -97 +97 @@
     //std::string output;
 
-    if (luaTags) luaSource_ = replaceLuaTags(levelString);
+    if (luaTags)
+      luaSource_ = replaceLuaTags(levelString);
+    else
+      luaSource_ = levelString;
     COUT(5) << "ParsedSourceCode: " << luaSource_ << std::endl;
   }
@@ -123 +126 @@
       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 = assert(io.open(\"" + this->includePath_ + "\"..\"/\"..f))\ncontent = file:read(\"*a\")\nfile:close()\nsource = scr:replaceLuaTags(content)\nassert(loadstring(source))()\nend\n";
+      std::string init =
+         "local scr = orxonox.LuaBind:getInstance()\n \
+          local debug = print\n \
+          print = function(s)\n \
+              scr:luaPrint(s)\n \
+          end\n \
+          include = function(f)\n \
+              file = assert(io.open(\"" + this->includePath_ + "\"..\"/\"..f))\n \
+              content = file:read(\"*a\")\n \
+              file:close()\n \
+              source = scr:replaceLuaTags(content)\n \
+              assert(loadstring(source))()\n \
+          end\n";
       init += luaSource_;
   #if LUA_VERSION_NUM == 501