[Scummvm-git-logs] scummvm master -> 7e9b8cb51331110c3497f90fc26ce28a571a178b

[sev-]

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

Summary:
6541adaa2e WAGE: allow using LET with negative number literals
7e9b8cb513 WAGE: support chr<scene conditionals


Commit: 6541adaa2ed891dc337e8ab24656a3265af7cefe
    https://github.com/scummvm/scummvm/commit/6541adaa2ed891dc337e8ab24656a3265af7cefe
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-11T00:40:29+02:00

Commit Message:
WAGE: allow using LET with negative number literals

Changed paths:
    engines/wage/script.cpp


diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp
index f7f7d92..4191da6 100644
--- a/engines/wage/script.cpp
+++ b/engines/wage/script.cpp
@@ -461,7 +461,7 @@ Script::Operand *Script::readStringOperand() {
 			*str += c;
 		else
 			break;
-		if (c < '0' || c > '9')
+		if ((c < '0' || c > '9') && !(c == '-' && str->empty()))
 			allDigits = false;
 	}
 	_data->seek(-1, SEEK_CUR);


Commit: 7e9b8cb51331110c3497f90fc26ce28a571a178b
    https://github.com/scummvm/scummvm/commit/7e9b8cb51331110c3497f90fc26ce28a571a178b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-11T00:45:25+02:00

Commit Message:
WAGE: support chr<scene conditionals

Changed paths:
    engines/wage/script.cpp


diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp
index 4191da6..d998e7b 100644
--- a/engines/wage/script.cpp
+++ b/engines/wage/script.cpp
@@ -653,6 +653,7 @@ struct Comparator {
 	{ '<', OBJ, SCENE, kCompLtObjScene },
 	{ '<', CHR, CHR, kCompEqChrChr }, // Same logic as =
 	{ '<', SCENE, SCENE, kCompEqSceneScene },
+	{ '<', CHR, SCENE, kCompGtChrScene }, // Same logic as >
 
 	{ '>', NUMBER, NUMBER, kCompGtNumNum },
 	{ '>', TEXT_INPUT, STRING, kCompLtTextInputString }, // Same logic as <