From 5054e10573a73f17b4f2891eb1e3bd8b379a527a Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 12 Jun 2003 18:18:58 +0000
Subject: this camera movement check seems to be new in V4 (or even V5 ?)

svn-id: r8451
---
 scumm/string.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'scumm/string.cpp')

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;
 	}
-- 
cgit v1.2.3