Changeset 2530 for code/branches/bugger/src/core

Timestamp:

Dec 23, 2008, 10:40:38 PM (16 years ago)

Author:

rgrieder

Message:

merged revisions 2260 - 2508 from trunk to buggy.
I'm sorry that I have to commit every merge. But otherwise I get tons of conflicts I have to solve ten times over.
Note: did not merge deletion of src/util/testing, tortoise wasn't very friendly with that.

Location:

code/branches/bugger

Files:

• . (modified) (1 prop)
• src/core/LuaBind.cc (modified) (3 diffs)
• src/core/Template.cc (modified) (1 prop)
• src/core/Template.h (modified) (1 prop)
• src/core/XMLFile.h (modified) (1 prop)
• src/core/XMLIncludes.h (modified) (1 prop)

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

@@ -87 +87 @@
     }
 
-    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";
@@ -100 +100 @@
     //std::string output;
 
-    if (luaTags) luaSource_ = replaceLuaTags(levelString);
+    if (luaTags)
+      luaSource_ = replaceLuaTags(levelString);
+    else
+      luaSource_ = levelString;
     COUT(5) << "ParsedSourceCode: " << luaSource_ << std::endl;
   }
@@ -126 +129 @@
       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