aboutsummaryrefslogtreecommitdiff
path: root/scumm/string.cpp
diff options
context:
space:
mode:
authorJonathan Gray2002-12-22 03:12:50 +0000
committerJonathan Gray2002-12-22 03:12:50 +0000
commitb78a518f0400b2e34f326da3e5ceddfea2137ea3 (patch)
tree8da52818fd4cc487c66521325e5ded5da4a10027 /scumm/string.cpp
parent0f2cba2cb10982ebf7a2723da47a393bafabde58 (diff)
downloadscummvm-rg350-b78a518f0400b2e34f326da3e5ceddfea2137ea3.tar.gz
scummvm-rg350-b78a518f0400b2e34f326da3e5ceddfea2137ea3.tar.bz2
scummvm-rg350-b78a518f0400b2e34f326da3e5ceddfea2137ea3.zip
remove old commented fixme, make turning off subtitles work in the scumm part of the dig, still needs to be done for smush
svn-id: r6053
Diffstat (limited to 'scumm/string.cpp')
-rw-r--r--scumm/string.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 0803f5102f..edead0597f 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -608,12 +608,10 @@ void Scumm::CHARSET_1()
if (_features & GF_OLD256)
charset.printCharOld(c);
else if (!(_features & GF_AFTER_V6)) {
-// if (!_vars[VAR_V5_CHARFLAG]) { /* FIXME */
if (!(_haveMsg == 0xFE && _noSubtitles))
charset.printChar(c);
-// }
} else {
- if (!(_haveMsg == 0xFE && _noSubtitles))
+ if (!((_haveMsg == 0xFE || _haveMsg == 0xFF) && _noSubtitles))
charset.printChar(c);
}