[Scummvm-git-logs] scummvm master -> 13798078336d0149833c962e11ec6a6feb3b3b84

[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:
1379807833 SCUMM: v0: Fix regression of last letter of verb missing


Commit: 13798078336d0149833c962e11ec6a6feb3b3b84
    https://github.com/scummvm/scummvm/commit/13798078336d0149833c962e11ec6a6feb3b3b84
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-08-11T14:16:09+02:00

Commit Message:
SCUMM: v0: Fix regression of last letter of verb missing

Also remove a leftover debug comment

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


diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 6951d0a720b..cc9dcc73168 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -1169,8 +1169,6 @@ void ScummEngine::displayDialog() {
 			}
 		}
 		if (_game.version <= 3) {
-			if (c == '%')
-				debug("hey");
 			_charset->printChar(c, false);
 			_msgCount += 1;
 		} else {
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index fe37f636d99..973f13eb35a 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -142,7 +142,7 @@ void ScummEngine_v0::verbDrawDemoString(int VerbDemoNumber) {
 	_string[2].charset = 1;
 	_string[2].ypos = _virtscr[kVerbVirtScreen].topline + (8 * VerbDemoNumber) + pixelYOffset;
 	_string[2].xpos = 0 + pixelXOffset;
-	_string[2].right = _virtscr[kVerbVirtScreen].w - 1;
+	_string[2].right = _virtscr[kVerbVirtScreen].w - 1 + pixelXOffset;
 	_string[2].color = v0DemoStr[VerbDemoNumber].color;
 	drawString(2, (byte *)string);
 }
@@ -1124,7 +1124,7 @@ void ScummEngine::drawVerb(int verb, int mode) {
 		_string[4].charset = vs->charset_nr;
 		_string[4].xpos = isRtl ? vs->origLeft : vs->curRect.left + pixelXOffset;
 		_string[4].ypos = vs->curRect.top + pixelYOffset;
-		_string[4].right = _screenWidth - 1;
+		_string[4].right = _screenWidth - 1 + pixelXOffset;
 		_string[4].center = vs->center;
 
 		if (vs->curmode == 2)