[Scummvm-cvs-logs] SF.net SVN: scummvm: [25264] scummvm/trunk/engines/scumm/string.cpp

[cyx at users.sourceforge.net]

Revision: 25264
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25264&view=rev
Author:   cyx
Date:     2007-01-29 12:39:18 -0800 (Mon, 29 Jan 2007)

Log Message:
-----------
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.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/string.cpp

Modified: scummvm/trunk/engines/scumm/string.cpp
===================================================================
--- scummvm/trunk/engines/scumm/string.cpp	2007-01-29 20:23:27 UTC (rev 25263)
+++ scummvm/trunk/engines/scumm/string.cpp	2007-01-29 20:39:18 UTC (rev 25264)
@@ -507,7 +507,7 @@
 #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 @@
 #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';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.