[Scummvm-cvs-logs] CVS: scummvm/scumm camera.cpp,2.19,2.20

Travis Howell kirben at users.sourceforge.net
Sun Jan 4 06:11:54 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv4116/scumm

Modified Files:
	camera.cpp 
Log Message:

Fix a few subtitles glitches in loomcd during cutscenes.


Index: camera.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/camera.cpp,v
retrieving revision 2.19
retrieving revision 2.20
diff -u -d -r2.19 -r2.20
--- camera.cpp	3 Jan 2004 21:22:06 -0000	2.19
+++ camera.cpp	4 Jan 2004 14:10:06 -0000	2.20
@@ -339,10 +339,16 @@
 	virtscr[0].xstart = _screenStartStrip * 8;
 #endif
 
-	if (_charset->_hasMask && (_version >= 4 && _gameId != GID_LOOM256)) {
+	if (_charset->_hasMask && _version > 3) {
 		int dx = camera._cur.x - camera._last.x;
 		int dy = camera._cur.y - camera._last.y;
-		if (dx || dy) {
+
+		// Fixes subtitle glitches during room scrolling in two cut scenes
+		// When talking to Rusty for first time
+		// When sleeping in straw at Blacksmith's Guild.
+		if (_gameId == GID_LOOM256 && dx)
+			gdi._mask.left -= 8;
+		else if (dx || dy) {
 			gdi._mask.left -= dx;
 			gdi._mask.right -= dx;
 			gdi._mask.top -= dy;





More information about the Scummvm-git-logs mailing list