[Scummvm-git-logs] scummvm master -> 631cbdce1f322df0379036a531340a0a98e52e36

[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:
631cbdce1f DIRECTOR: LINGO: Remove quirk handling from <> op


Commit: 631cbdce1f322df0379036a531340a0a98e52e36
    https://github.com/scummvm/scummvm/commit/631cbdce1f322df0379036a531340a0a98e52e36
Author: djsrv (dservilla at gmail.com)
Date: 2020-05-16T02:32:32+02:00

Commit Message:
DIRECTOR: LINGO: Remove quirk handling from <> op

Upon further testing, this behavior only applies to the = operator.

Changed paths:
    engines/director/lingo/lingo-code.cpp
    engines/director/lingo/tests/lists.lingo


diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 45f59def0e..083e95148c 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -1063,15 +1063,6 @@ void LC::c_eq() {
 }
 
 Datum LC::neqData(Datum d1, Datum d2) {
-	// Lingo doesn't bother checking list equality if the left is longer
-	if (d1.type == ARRAY && d2.type == ARRAY &&
-			d1.u.farr->size() > d2.u.farr->size()) {
-		return Datum(0);
-	}
-	if (d1.type == PARRAY && d2.type == PARRAY &&
-			d1.u.parr->size() > d2.u.parr->size()) {
-		return Datum(0);
-	}
 	if (d1.type == ARRAY || d2.type == ARRAY ||
 			d1.type == PARRAY || d2.type == PARRAY) {
 		return LC::compareArrays(LC::neqData, d1, d2, false, true);
diff --git a/engines/director/lingo/tests/lists.lingo b/engines/director/lingo/tests/lists.lingo
index 640cd054dd..0c4d431254 100644
--- a/engines/director/lingo/tests/lists.lingo
+++ b/engines/director/lingo/tests/lists.lingo
@@ -35,6 +35,9 @@ set res to a = b
 set res to a >= b
 set res to b = a
 set res to b >= a
+set b to [1]
+set res to a = b
+set res to a <> b
 
 set a to [#a:6, #b:3, #c:8, #d:5]
 set res to a = machinery