[Scummvm-git-logs] scummvm master -> 6000a0b472f4b6794d2f9e78f421c34aac4cd13e

[athrxx]

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:
6000a0b472 SCUMM: (MI1/SegaCD/JP) -  fix bug 11943


Commit: 6000a0b472f4b6794d2f9e78f421c34aac4cd13e
    https://github.com/scummvm/scummvm/commit/6000a0b472f4b6794d2f9e78f421c34aac4cd13e
Author: athrxx (athrxx at scummvm.org)
Date: 2020-11-07T19:59:41+01:00

Commit Message:
SCUMM: (MI1/SegaCD/JP) -  fix bug 11943

(SCUMM: Invalid text rendering with Monkey Island 1 (SegaCD Japanese))

Only add vs->xstart offset if the font is actually rendered on the vs.

Changed paths:
    engines/scumm/charset.cpp


diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index 2a727ecaf5..e66d867f23 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -1124,7 +1124,7 @@ void CharsetRendererClassic::printCharIntern(bool is2byte, const byte *charPtr,
 	} else {
 		Graphics::Surface dstSurface;
 		Graphics::Surface backSurface;
-		if ((ignoreCharsetMask || !vs->hasTwoBuffers)) {
+		if (ignoreCharsetMask || !vs->hasTwoBuffers) {
 			dstSurface = *vs;
 			dstPtr = vs->getPixels(_left, drawTop);
 		} else {
@@ -1144,7 +1144,7 @@ void CharsetRendererClassic::printCharIntern(bool is2byte, const byte *charPtr,
 		}
 
 		if (is2byte && _vm->_game.platform != Common::kPlatformFMTowns)
-			drawBits1(dstSurface, _left + vs->xstart, drawTop, charPtr, drawTop, origWidth, origHeight);
+			drawBits1(dstSurface, (ignoreCharsetMask || !vs->hasTwoBuffers) ? _left + vs->xstart : _left, drawTop, charPtr, drawTop, origWidth, origHeight);
 		else
 			drawBitsN(dstSurface, dstPtr, charPtr, *_fontPtr, drawTop, origWidth, origHeight);