aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/actor.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/actor.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/actor.cpp')
-rw-r--r--engines/scumm/actor.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 8882abfeb4..5002a22a6f 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1884,13 +1884,16 @@ void ScummEngine_v7::actorTalk(const byte *msg) {
if (_game.version == 7)
VAR(VAR_HAVE_MSG) = 0xFF;
_haveActorSpeechMsg = true;
- if (_game.version == 8) {
+ if (_game.id == GID_DIG || _game.id == GID_CMI) {
stringWrap = _string[0].wrapping;
_string[0].wrapping = true;
}
CHARSET_1();
- if (_game.version == 8) {
- VAR(VAR_HAVE_MSG) = (_string[0].no_talk_anim) ? 2 : 1;
+ if (_game.id == GID_DIG || _game.id == GID_CMI) {
+ if (_game.version == 8)
+ VAR(VAR_HAVE_MSG) = (_string[0].no_talk_anim) ? 2 : 1;
+ else
+ VAR(VAR_HAVE_MSG) = 1;
_string[0].wrapping = stringWrap;
}
}