[Scummvm-git-logs] scummvm master -> 404071df0effe52d0e96553da8bc9b4149e4466a

[bluegr]

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:
fe642720d8 SCUMM: Add RTL support for MM
404071df0e SCUMM: Add zak and MM Hebrew preposition


Commit: fe642720d82b0a68f33214f03cb73c017b5abf02
    https://github.com/scummvm/scummvm/commit/fe642720d82b0a68f33214f03cb73c017b5abf02
Author: ShaharAriel (ShaharAriel at users.noreply.github.com)
Date: 2022-05-15T16:26:04+03:00

Commit Message:
SCUMM: Add RTL support for MM

This add MM to existing fixes of RTL support

Changed paths:
    engines/scumm/scumm.cpp
    engines/scumm/string.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 4a305b0fe55..db0ac280b8d 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -312,7 +312,8 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 		_herculesBuf = (byte *)malloc(kHercWidth * kHercHeight);
 	}
 
-	_isRTL = (_game.version >= 4 && _game.version < 7 && _game.heversion == 0 && _language == Common::HE_ISR);
+	_isRTL = (_language == Common::HE_ISR && _game.heversion == 0)
+			&& (_game.id == GID_MANIAC || (_game.version >= 4 && _game.version < 7));
 #ifndef DISABLE_HELP
 	// Create custom GMM dialog providing a help subdialog
 	assert(!_mainMenuDialog);
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 4b5ece9c107..eedc7879370 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -539,7 +539,7 @@ bool ScummEngine::newLine() {
 			// the original code it seems that setting _nextLeft to 0 is the right thing to do here.
 			_nextLeft = /*_game.version >= 6 ? _string[0].xpos :*/ 0;
 	} else if (_isRTL) {
-		if (_game.id == GID_MONKEY && _charset->getCurID() == 4) {
+		if (_game.id == GID_MANIAC || (_game.id == GID_MONKEY && _charset->getCurID() == 4)) {
 			_nextLeft = _screenWidth - _charset->getStringWidth(0, _charsetBuffer + _charsetBufPos) - _nextLeft;
 		}
 	}
@@ -786,7 +786,7 @@ void ScummEngine::CHARSET_1() {
 		if (_nextLeft < 0)
 			_nextLeft = _game.version >= 6 ? _string[0].xpos : 0;
 	} else if (_isRTL) {
-		if (_game.id == GID_MONKEY && _charset->getCurID() == 4) {
+		if (_game.id == GID_MANIAC || (_game.id == GID_MONKEY && _charset->getCurID() == 4)) {
 			_nextLeft = _screenWidth - _charset->getStringWidth(0, _charsetBuffer + _charsetBufPos) - _nextLeft;
 		}
 	}
@@ -955,7 +955,7 @@ void ScummEngine::drawString(int a, const byte *msg) {
 
 	if (_charset->_center) {
 		_charset->_left -= _charset->getStringWidth(a, buf) / 2;
-	} else if (_isRTL && _game.id != GID_SAMNMAX) {
+	} else if (_isRTL && _game.id != GID_SAMNMAX && _game.id != GID_MANIAC) {
 		// Ignore INDY4 verbs (but allow dialogue)
 		if (_game.id != GID_INDY4 || buf[0] == 127) {
 			if (_game.id == GID_INDY4)


Commit: 404071df0effe52d0e96553da8bc9b4149e4466a
    https://github.com/scummvm/scummvm/commit/404071df0effe52d0e96553da8bc9b4149e4466a
Author: ShaharAriel (ShaharAriel at users.noreply.github.com)
Date: 2022-05-15T16:26:04+03:00

Commit Message:
SCUMM: Add zak and MM Hebrew preposition

The English chars here are reference in font to Hebrew chars

Changed paths:
    engines/scumm/script_v2.cpp


diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index b78102fcbfd..30d3b48a33c 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -967,6 +967,7 @@ void ScummEngine_v2::drawPreposition(int index) {
 			{ " ", " in", " con", " su", " a" },     // Italian
 			{ " ", " en", " con", " en", " a" },     // Spanish
 			{ " ", " \x7f", " \x7f", " na", " \x7f" },// Russian
+			{ " ", " B", " SN", " SM", " M" },       // Hebrew
 			};
 		int lang;
 		switch (_language) {
@@ -985,6 +986,9 @@ void ScummEngine_v2::drawPreposition(int index) {
 		case Common::RU_RUS:
 			lang = 5;
 			break;
+		case Common::HE_ISR:
+			lang = 6;
+			break;
 		default:
 			lang = 0;	// Default to english
 		}