[Scummvm-git-logs] scummvm master -> 3eb2cf61e49e12ea3b00998290ac390e6e6e5857

[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:
3eb2cf61e4 DIRECTOR: LINGO: Properly implement the romanLingo


Commit: 3eb2cf61e49e12ea3b00998290ac390e6e6e5857
    https://github.com/scummvm/scummvm/commit/3eb2cf61e49e12ea3b00998290ac390e6e6e5857
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-05-24T00:54:04+02:00

Commit Message:
DIRECTOR: LINGO: Properly implement the romanLingo

Changed paths:
    engines/director/lingo/lingo-the.cpp
    engines/director/lingo/lingo.cpp
    engines/director/lingo/lingo.h


diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 1df64cb195e..d5743cfe535 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -750,7 +750,8 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		break;
 	case kTheRomanLingo:
 		d.type = INT;
-		d.u.i = 0;		//Set to FALSE to support non-roman character set in Lingo
+		d.u.i = g_lingo->_romanLingo;
+		warning("BUILDBOT: the romanLingo is get, value is %d", g_lingo->_romanLingo);
 		break;
 	case kTheScummvmVersion:
 		d.type = INT;
@@ -1032,6 +1033,8 @@ void Lingo::setTheEntity(int entity, Datum &id, int field, Datum &d) {
 		g_director->_rnd.setSeed(d.asInt());
 		break;
 	case kTheRomanLingo:
+		g_lingo->_romanLingo = bool(d.asInt());
+		warning("BUILDBOT: the romanLingo is set to %d", g_lingo->_romanLingo);
 		setTheEntitySTUB(kTheRomanLingo);
 		break;
 	case kTheScummvmVersion:
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 5c82daff9ac..52fd34d5553 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -168,6 +168,7 @@ Lingo::Lingo(DirectorEngine *vm) : _vm(vm) {
 	_itemDelimiter = ',';
 	_exitLock = false;
 	_preLoadEventAbort = false;
+	_romanLingo = (_vm->getLanguage() != Common::JA_JPN); // Japanrdr gamrs typically require 3-byte encodings
 
 	_searchPath.type = ARRAY;
 	_searchPath.u.farr = new FArray;
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index d6702cde56c..dee395e8eef 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -386,6 +386,7 @@ public:
 	bool _trace;	// state of movie's trace function
 	int _traceLoad; // internal Director verbosity level
 	bool _updateMovieEnabled;
+	bool _romanLingo;
 
 	Datum getTheEntity(int entity, Datum &id, int field);
 	void setTheEntity(int entity, Datum &id, int field, Datum &d);