diff options
| author | Max Horn | 2002-12-25 21:14:26 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-25 21:14:26 +0000 |
| commit | d808e4da1f419ebcf8fb1a7554b09a867ae973ef (patch) | |
| tree | 51529273eb43a603569e5b42ff77337efca9db5b /scumm/string.cpp | |
| parent | fca9ec09e7709ff4400d2a9a7fd76f4f21781006 (diff) | |
| download | scummvm-rg350-d808e4da1f419ebcf8fb1a7554b09a867ae973ef.tar.gz scummvm-rg350-d808e4da1f419ebcf8fb1a7554b09a867ae973ef.tar.bz2 scummvm-rg350-d808e4da1f419ebcf8fb1a7554b09a867ae973ef.zip | |
cleanup
svn-id: r6148
Diffstat (limited to 'scumm/string.cpp')
| -rw-r--r-- | scumm/string.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index a956194be0..db5d19488d 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -242,13 +242,13 @@ void Scumm::CHARSET_1() if (c != 0xFF) { _charset->_left = _charset->_nextLeft; _charset->_top = _charset->_nextTop; - if (_features & GF_OLD256) + if (_features & GF_OLD256) { _charset->printCharOld(c); - else if (!(_features & GF_AFTER_V6)) { - if (!(_haveMsg == 0xFE && _noSubtitles)) + } else if (_features & GF_AFTER_V6) { + if (!_noSubtitles || (_haveMsg != 0xFE && _haveMsg != 0xFF)) _charset->printChar(c); } else { - if (!((_haveMsg == 0xFE || _haveMsg == 0xFF) && _noSubtitles)) + if (!_noSubtitles || _haveMsg != 0xFE) _charset->printChar(c); } |