[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.139,1.140
Max Horn
fingolfin at users.sourceforge.net
Thu Jun 12 11:20:01 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv27291
Modified Files:
string.cpp
Log Message:
this camera movement check seems to be new in V4 (or even V5 ?)
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- string.cpp 10 Jun 2003 06:41:16 -0000 1.139
+++ string.cpp 12 Jun 2003 18:18:58 -0000 1.140
@@ -86,11 +86,7 @@
if (!_haveMsg)
return;
- // 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_NEW_CAMERA) && !(_gameId == GID_ZAK256 && VAR(VAR_TALK_ACTOR) == 0xFF)) {
+ if (!(_features & GF_NEW_CAMERA) && _version >= 4) {
if ((camera._dest.x >> 3) != (camera._cur.x >> 3) || camera._cur.x != camera._last.x)
return;
}
More information about the Scummvm-git-logs
mailing list