[Scummvm-git-logs] scummvm master -> 692685bb4034c2ff786eface09440b75eaedaf68

[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:
692685bb40 SCUMM: extend fix 36a5571 to all v4 targets


Commit: 692685bb4034c2ff786eface09440b75eaedaf68
    https://github.com/scummvm/scummvm/commit/692685bb4034c2ff786eface09440b75eaedaf68
Author: athrxx (athrxx at scummvm.org)
Date: 2022-08-07T18:57:04+02:00

Commit Message:
SCUMM: extend fix 36a5571 to all v4 targets

(the code for the calculation of the y pos seems to be exactly the same)

Changed paths:
    engines/scumm/string.cpp


diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index c46e841b5e9..2ca12e141de 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -691,7 +691,7 @@ void ScummEngine::CHARSET_1() {
 
 		if (_game.version <= 5) {
 			if (VAR(VAR_V5_TALK_STRING_Y) < 0) {
-				if (_game.id == GID_MONKEY_EGA || _game.id == GID_MONKEY_VGA) {
+				if (_game.version == 4) {
 					_string[0].ypos = (int)VAR(VAR_V5_TALK_STRING_Y) + a->getPos().y + a->getElevation();
 				} else {
 					s = (a->_scaley * (int)VAR(VAR_V5_TALK_STRING_Y)) / 0xFF;