[Scummvm-cvs-logs] scummvm master -> 4025c20ea474d7978eb1c7267573f344a9b8830a

[clone2727]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4025c20ea4 MOHAWK: Fix parsing the Arthur's Computer Adventure globals section


Commit: 4025c20ea474d7978eb1c7267573f344a9b8830a
    https://github.com/scummvm/scummvm/commit/4025c20ea474d7978eb1c7267573f344a9b8830a
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2015-07-04T12:35:37-04:00

Commit Message:
MOHAWK: Fix parsing the Arthur's Computer Adventure globals section

Changed paths:
    engines/mohawk/livingbooks_code.cpp



diff --git a/engines/mohawk/livingbooks_code.cpp b/engines/mohawk/livingbooks_code.cpp
index c9a1171..b5ea547 100644
--- a/engines/mohawk/livingbooks_code.cpp
+++ b/engines/mohawk/livingbooks_code.cpp
@@ -1746,6 +1746,10 @@ uint LBCode::parseCode(const Common::String &source) {
 		if (token != ' ' && token != '(' && wasFunction)
 			error("while parsing script '%s', encountered incomplete function call", source.c_str());
 
+		// Skip C++-style comments
+		if (token == '/' && lookahead == '/')
+			break;
+
 		// First, we check for simple operators.
 		for (uint i = 0; i < NUM_LB_OPERATORS; i++) {
 			if (token != operators[i].token)
@@ -1776,6 +1780,7 @@ uint LBCode::parseCode(const Common::String &source) {
 		switch (token) {
 		// whitespace
 		case ' ':
+		case '\t':
 			// ignore
 			break;
 		// literal string