[Scummvm-cvs-logs] CVS: scummvm/scumm camera.cpp,2.14,2.15 gfx.cpp,2.218,2.219 scummvm.cpp,2.426,2.427

[Travis Howell]

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

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

Fix text when room scrolls in game versions < 3.
Manual redraw of verbs areas isn't require after reload of game in loom/loomcd, causes glitches in some locations.


Index: camera.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/camera.cpp,v
retrieving revision 2.14
retrieving revision 2.15
diff -u -d -r2.14 -r2.15
--- camera.cpp	6 Oct 2003 12:28:52 -0000	2.14
+++ camera.cpp	6 Oct 2003 23:12:01 -0000	2.15
@@ -57,8 +57,8 @@
 	}
 
 	// If the camera moved and text is visible, remove it
-	if (camera._cur.x != camera._last.x && _charset->_hasMask)
-		stopTalk();
+	//if (camera._cur.x != camera._last.x && _charset->_hasMask)
+	//	stopTalk();
 }
 
 void ScummEngine_v7::setCameraAt(int pos_x, int pos_y) {

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.218
retrieving revision 2.219
diff -u -d -r2.218 -r2.219
--- gfx.cpp	5 Oct 2003 02:58:11 -0000	2.218
+++ gfx.cpp	6 Oct 2003 23:12:01 -0000	2.219
@@ -731,7 +731,7 @@
 	int diff;
 
 	if (!(_features & GF_NEW_CAMERA))
-		if (camera._cur.x != camera._last.x && _charset->_hasMask)
+		if (camera._cur.x != camera._last.x && _charset->_hasMask && _version > 3)
 			stopTalk();
 
 	val = 0;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.426
retrieving revision 2.427
diff -u -d -r2.426 -r2.427
--- scummvm.cpp	5 Oct 2003 17:32:38 -0000	2.426
+++ scummvm.cpp	6 Oct 2003 23:12:01 -0000	2.427
@@ -1371,7 +1371,6 @@
 			int args = 2;
 			uint value = (_gameId == GID_LOOM256) ? 150 : 100;
 			byte restoreScript = (_features & GF_FMTOWNS) ? 17 : 18;
-			redrawVerbs();
 			// if verbs should be shown restore them
 			if (VAR(value) == 2)
 				runScript(restoreScript, 0, 0, &args);