[Scummvm-cvs-logs] CVS: scummvm string.cpp,1.50,1.51

[James Brown]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv10211

Modified Files:
	string.cpp 
Log Message:
Fix by yot to prevent two Zak freezes. This may be a fixme.
Zak is now pretty much bugless except for a walkbox issue and some sound
stuff.




Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- string.cpp	12 Jul 2002 21:36:20 -0000	1.50
+++ string.cpp	31 Jul 2002 13:33:07 -0000	1.51
@@ -203,7 +203,11 @@
 	if (!_haveMsg)
 		return;
 
-	if (!(_features & GF_AFTER_V7)) {
+	// FIXME: This Zak check fixes several hangs (Yak hang, and opening
+	// 'secret room while walking' hang. It doesn't do the camera check
+	// when the talk target isn't an actor. The question is, can we make
+	// this a more general case? Does it really need to be Zak specific?
+	if (!(_features & GF_AFTER_V7) && !(_gameId==GID_ZAK256 && _vars[VAR_TALK_ACTOR] == 0xFF)) {
 		if ((camera._dest.x >> 3) != (camera._cur.x >> 3) || camera._cur.x != camera._last.x)
 			return;
 	}