aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/string.cpp
diff options
context:
space:
mode:
authorTravis Howell2008-04-30 04:38:29 +0000
committerTravis Howell2008-04-30 04:38:29 +0000
commitbad36eaa614c0e60ba501e0207c607a0e54756c0 (patch)
tree146e2c0daf550e83d2958ed4c2243588a30b25ab /engines/scumm/string.cpp
parent97d2d16757586c2d6d792bc0fc4b8b00a8c35c05 (diff)
downloadscummvm-rg350-bad36eaa614c0e60ba501e0207c607a0e54756c0.tar.gz
scummvm-rg350-bad36eaa614c0e60ba501e0207c607a0e54756c0.tar.bz2
scummvm-rg350-bad36eaa614c0e60ba501e0207c607a0e54756c0.zip
The Dig (Second release) used similar charset code to COMI. This could cause regressions, if there are differences between the two releases of The Dig.
svn-id: r31784
Diffstat (limited to 'engines/scumm/string.cpp')
-rw-r--r--engines/scumm/string.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 34ec494850..dfaf0dc6e6 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -679,7 +679,12 @@ void ScummEngine::CHARSET_1() {
}
#ifndef DISABLE_SCUMM_7_8
-void ScummEngine_v8::CHARSET_1() {
+void ScummEngine_v7::CHARSET_1() {
+ if (_game.id == GID_FT) {
+ ScummEngine::CHARSET_1();
+ return;
+ }
+
byte subtitleBuffer[2048];
byte *subtitleLine = subtitleBuffer;
Common::Point subtitlePos;
@@ -830,7 +835,7 @@ void ScummEngine_v8::CHARSET_1() {
}
}
}
- _haveMsg = 2;
+ _haveMsg = (_game.version == 8) ? 2 : 1;
_keepText = false;
_string[0] = saveStr;
}