From 9b9117d0c638071780bd6ccb4feb8c0ac2fa1a3e Mon Sep 17 00:00:00 2001 From: Gregory Montoir Date: Mon, 29 Jan 2007 20:39:18 +0000 Subject: [PATCH] Changed computation of _nextTop in v7/v8 games to represent an absolute y-coordinate (ie. not relative to _screenTop) in order to match the computation done for games <= v6. This should prevent any issues with vertical scrolling rooms. svn-id: r25264 --- engines/scumm/string.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index 19bac38ba91..95b236544fe 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -507,7 +507,7 @@ void ScummEngine::CHARSET_1() { #ifndef DISABLE_SCUMM_7_8 ((ScummEngine_v7 *)this)->clearSubtitleQueue(); _nextLeft = _string[0].xpos; - _nextTop = _string[0].ypos; + _nextTop = _string[0].ypos + _screenTop; #endif } else { restoreCharsetBg(); @@ -583,7 +583,8 @@ void ScummEngine::CHARSET_1() { #ifndef DISABLE_SCUMM_7_8 if (subtitleLine == subtitleBuffer) { subtitlePos.x = _charset->_left; - subtitlePos.y = _charset->_top; + // BlastText position is relative to the top of the screen, adjust y-coordinate + subtitlePos.y = _charset->_top - _screenTop; } *subtitleLine++ = c; *subtitleLine = '\0';