From edb3fdfca5088e79f9ee0cfe93fa1f3a5eefb8ce Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 25 Jul 2022 22:24:17 +0300 Subject: [PATCH] SCUMM: Fix RTL indentation for charset 4 on Monkey Island 2 --- engines/scumm/string.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index eedc7879370..0080dc0e33f 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_MANIAC || (_game.id == GID_MONKEY && _charset->getCurID() == 4)) { + if (_game.id == GID_MANIAC || ((_game.id == GID_MONKEY || _game.id == GID_MONKEY2) && _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_MANIAC || (_game.id == GID_MONKEY && _charset->getCurID() == 4)) { + if (_game.id == GID_MANIAC || ((_game.id == GID_MONKEY || _game.id == GID_MONKEY2) && _charset->getCurID() == 4)) { _nextLeft = _screenWidth - _charset->getStringWidth(0, _charsetBuffer + _charsetBufPos) - _nextLeft; } }