Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	dep/PackageList.txt
	src/tools/map_extractor/System.cpp

1 files changed, 15 insertions, 13 deletions

diff --git a/dep/g3dlite/source/TextInput.cpp b/dep/g3dlite/source/TextInput.cpp
index 09abacc7391..354d0de13c0 100644
--- a/dep/g3dlite/source/TextInput.cpp
+++ b/dep/g3dlite/source/TextInput.cpp
@@ -128,32 +128,34 @@ Token TextInput::read() {
 }
 
 
-std::string TextInput::readUntilNewlineAsString() {
-    // Go to the front of the next token
-    Token t = read();
 
-    // Reset the position to the start of this token
+std::string TextInput::readUntilNewlineAsString() {
+/*
+    // Reset the read position back to the start of that token
     currentCharOffset = t.bytePosition();
+    lineNumber = t.line();
+    charNumber = t.character();
     stack.clear();
 
     if (currentCharOffset == buffer.size()) {
         // End of file
         return "";
     }
-
+    */
     std::string s;
 
     // Read until newline or eof
     char c = '\0';
     do {
-      c = buffer[currentCharOffset];
-      if (c == '\r' || c == '\n') {
-          // Done
-          break;
-      } else {
-          s += c;
-          ++currentCharOffset;
-      }
+        c = buffer[currentCharOffset];
+        if (c == '\r' || c == '\n') {
+            // Done
+            break;
+        } else {
+            s += c;
+            ++currentCharOffset;
+            ++charNumber;
+        }
     } while (currentCharOffset < buffer.size());
 
     return s;