diff options
| author | Max Horn | 2003-06-12 18:18:58 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-12 18:18:58 +0000 |
| commit | 5054e10573a73f17b4f2891eb1e3bd8b379a527a (patch) | |
| tree | 923bd0b1a80effc782ad01a7730b76dbd91927b1 /scumm/string.cpp | |
| parent | 66af2e98616288165a9093e139fa6cf8bd901ad9 (diff) | |
| download | scummvm-rg350-5054e10573a73f17b4f2891eb1e3bd8b379a527a.tar.gz scummvm-rg350-5054e10573a73f17b4f2891eb1e3bd8b379a527a.tar.bz2 scummvm-rg350-5054e10573a73f17b4f2891eb1e3bd8b379a527a.zip | |
this camera movement check seems to be new in V4 (or even V5 ?)
svn-id: r8451
Diffstat (limited to 'scumm/string.cpp')
| -rw-r--r-- | scumm/string.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index fcf9e49ff5..1d9f01d3ef 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -86,11 +86,7 @@ void Scumm::CHARSET_1() { 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; } |