[Scummvm-git-logs] scummvm master -> 90661dbd11a1b2e0b7738426c86cb8a2f9d60f6f

[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:
90661dbd11 DIRECTOR: LINGO: Ignore diacritics in = operator


Commit: 90661dbd11a1b2e0b7738426c86cb8a2f9d60f6f
    https://github.com/scummvm/scummvm/commit/90661dbd11a1b2e0b7738426c86cb8a2f9d60f6f
Author: djsrv (dservilla at gmail.com)
Date: 2020-04-19T23:29:21+02:00

Commit Message:
DIRECTOR: LINGO: Ignore diacritics in = operator

Changed paths:
    engines/director/lingo/lingo.cpp
    engines/director/lingo/tests/strings.lingo


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 564d9ce08b..3816c4edd6 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -31,6 +31,7 @@
 #include "director/frame.h"
 #include "director/score.h"
 #include "director/sprite.h"
+#include "director/util.h"
 
 namespace Director {
 
@@ -601,7 +602,9 @@ int Datum::compareTo(Datum d) {
 
 int Datum::compareToIgnoreCase(Datum d) {
 	if (type == STRING && d.type == STRING) {
-		return u.s->compareToIgnoreCase(*d.u.s);
+		Common::String *s1 = toLowercaseMac(u.s);
+		Common::String *s2 = toLowercaseMac(d.u.s);
+		return s1->compareTo(*s2);
 	}
 	return compareTo(d);
 }
diff --git a/engines/director/lingo/tests/strings.lingo b/engines/director/lingo/tests/strings.lingo
index a59109206f..f45fafe4b1 100644
--- a/engines/director/lingo/tests/strings.lingo
+++ b/engines/director/lingo/tests/strings.lingo
@@ -11,6 +11,11 @@ if z1 contains "Me
 else
 	put "Doesn't contain"
 end if
+if "meow" = "MeÍW" then
+	put "Equals"
+else
+	put "Doesn't equal"
+end if
 
 put "That is the last line of the file." & return & "Click Done to exit." && return && "foo"