aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/string.cpp
diff options
context:
space:
mode:
authorTravis Howell2006-03-14 09:33:37 +0000
committerTravis Howell2006-03-14 09:33:37 +0000
commitf6d69c6d45febe555ef4263db6e74446dc375d71 (patch)
tree2f5c3820fcbde201b5f43f4a9348786e665183fa /engines/scumm/string.cpp
parentc1965435723f7f06924c51fd4d960d9fc550cc7b (diff)
downloadscummvm-rg350-f6d69c6d45febe555ef4263db6e74446dc375d71.tar.gz
scummvm-rg350-f6d69c6d45febe555ef4263db6e74446dc375d71.tar.bz2
scummvm-rg350-f6d69c6d45febe555ef4263db6e74446dc375d71.zip
Camera scrolling only effects subtitles in SCUMM4-6 games. Fixes bug #1329482.
svn-id: r21274
Diffstat (limited to 'engines/scumm/string.cpp')
-rw-r--r--engines/scumm/string.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 07013025e6..518a683639 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -419,7 +419,7 @@ void ScummEngine::CHARSET_1() {
if (!_haveMsg)
return;
- if (!(_game.features & GF_NEW_CAMERA) && !(_game.id == GID_ZAK && (_game.platform == Common::kPlatformFMTowns) && getTalkingActor() == 0xFF)) {
+ if (_game.version >= 4 && _game.version <= 6) {
if ((camera._dest.x / 8) != (camera._cur.x / 8) || camera._cur.x != camera._last.x)
return;
}