[Scummvm-cvs-logs] CVS: scummvm/scumm camera.cpp,2.21,2.22 gfx.cpp,2.255,2.256

Travis Howell kirben at users.sourceforge.net
Tue Jan 6 05:29:01 CET 2004


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

Modified Files:
	camera.cpp gfx.cpp 
Log Message:

Fix subtitles glitch when subtitles are shown during room scroll in pass.


Index: camera.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/camera.cpp,v
retrieving revision 2.21
retrieving revision 2.22
diff -u -d -r2.21 -r2.22
--- camera.cpp	6 Jan 2004 12:45:30 -0000	2.21
+++ camera.cpp	6 Jan 2004 13:28:19 -0000	2.22
@@ -346,7 +346,7 @@
 		// 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)
+		if ((_gameId == GID_LOOM256 || _gameId == GID_PASS) && dx)
 			gdi._mask.left -= 8;
 		else if (dx || dy) {
 			gdi._mask.left -= dx;

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.255
retrieving revision 2.256
diff -u -d -r2.255 -r2.256
--- gfx.cpp	6 Jan 2004 12:45:30 -0000	2.255
+++ gfx.cpp	6 Jan 2004 13:28:19 -0000	2.256
@@ -495,7 +495,7 @@
 	int diff;
 
 	if (!(_features & GF_NEW_CAMERA))
-		if (camera._cur.x != camera._last.x && _charset->_hasMask && _version > 3)
+		if (camera._cur.x != camera._last.x && _charset->_hasMask && (_version > 3 && _gameId != GID_PASS))
 			stopTalk();
 
 	val = 0;





More information about the Scummvm-git-logs mailing list