[Scummvm-git-logs] scummvm master -> c623830615698b27f7a630f35f5a5d1d3ce88ec1

[sev-]

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:
c623830615 DIRECTOR: LINGO: Correctly count \xC2 as new line in lexer


Commit: c623830615698b27f7a630f35f5a5d1d3ce88ec1
    https://github.com/scummvm/scummvm/commit/c623830615698b27f7a630f35f5a5d1d3ce88ec1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-20T01:35:37+02:00

Commit Message:
DIRECTOR: LINGO: Correctly count \xC2 as new line in lexer

Changed paths:
    engines/director/lingo/lingo-lex.cpp
    engines/director/lingo/lingo-lex.l


diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index a30190991d..59d552deac 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -768,7 +768,7 @@ static void count() {
 	}
 
 	while (*p == '\n' || *p == '\r' || *p == '\xC2') {
-		if (*p == '\n') {
+		if (*p == '\n' || *p == '\xC2') {
 			g_lingo->_linenumber++;
 			g_lingo->_colnumber = 0;
 		}
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index d5d0dcba5b..ec5345db73 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -60,7 +60,7 @@ static void count() {
 	}
 
 	while (*p == '\n' || *p == '\r' || *p == '\xC2') {
-		if (*p == '\n') {
+		if (*p == '\n' || *p == '\xC2') {
 			g_lingo->_linenumber++;
 			g_lingo->_colnumber = 0;
 		}