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

[AndywinXp]

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:
3ed177d9f0 SCUMM: NES: Fix text position on kTextVirtScreen


Commit: 3ed177d9f0c4cbe24a47a59e5daaacc31510489d
    https://github.com/scummvm/scummvm/commit/3ed177d9f0c4cbe24a47a59e5daaacc31510489d
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-08-14T08:52:27+02:00

Commit Message:
SCUMM: NES: Fix text position on kTextVirtScreen

Changed paths:
    engines/scumm/charset.cpp


diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index 90ab517fd17..66bf885b31a 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -2161,8 +2161,8 @@ void CharsetRendererNES::printChar(int chr, bool ignoreCharsetMask) {
 	}
 
 	int drawTop = _top - vs->topline;
-
-	_vm->markRectAsDirty(vs->number, _left, _left + width, drawTop, drawTop + height);
+	int offset = vs->number == kTextVirtScreen ? 16 : 0;
+	_vm->markRectAsDirty(vs->number, _left + offset, _left + width + offset, drawTop, drawTop + height);
 
 	if (!ignoreCharsetMask) {
 		_hasMask = true;
@@ -2170,9 +2170,9 @@ void CharsetRendererNES::printChar(int chr, bool ignoreCharsetMask) {
 	}
 
 	if (ignoreCharsetMask || !vs->hasTwoBuffers)
-		drawBits1(*vs, _left + vs->xstart, drawTop, charPtr, drawTop, origWidth, origHeight);
+		drawBits1(*vs, _left + vs->xstart + offset, drawTop, charPtr, drawTop, origWidth, origHeight);
 	else
-		drawBits1(_vm->_textSurface, _left, _top, charPtr, drawTop, origWidth, origHeight);
+		drawBits1(_vm->_textSurface, _left + offset, _top, charPtr, drawTop, origWidth, origHeight);
 
 	if (_str.left > _left)
 		_str.left = _left;