diff options
| author | Max Horn | 2004-04-08 23:38:09 +0000 |
|---|---|---|
| committer | Max Horn | 2004-04-08 23:38:09 +0000 |
| commit | 2b94290c9738f3c3988c4b8e00edfab1663516f3 (patch) | |
| tree | d54c3464186d3f9966dee516fdbd3568b9304a06 /scumm/string.cpp | |
| parent | ecf6976890888d329c2762f74abe812545a23c54 (diff) | |
| download | scummvm-rg350-2b94290c9738f3c3988c4b8e00edfab1663516f3.tar.gz scummvm-rg350-2b94290c9738f3c3988c4b8e00edfab1663516f3.tar.bz2 scummvm-rg350-2b94290c9738f3c3988c4b8e00edfab1663516f3.zip | |
cleanup
svn-id: r13506
Diffstat (limited to 'scumm/string.cpp')
| -rw-r--r-- | scumm/string.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index 1d5981cb48..285d5cb6eb 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -160,12 +160,6 @@ void ScummEngine::CHARSET_1() { _talkDelay = 60; if (!_keepText) { - if (_version <= 3 && _gameId != GID_LOOM) { -// FIXME: Remove this commented out code eventually -// if (!_charset->_hasMask) -// warning("_hasMask mismatch (case C) - please report to Fingolfin"); -// _charset->_hasMask = true; - } _charset->restoreCharsetBg(); } @@ -313,10 +307,9 @@ void ScummEngine::CHARSET_1() { _charsetBufPos = buffer - _charsetBuffer; - // FIXME: Remove this and the next three lines eventually! + // FIXME: Remove this and the next two lines eventually! if (_charset->_hasMask != (_charset->_str.left != -1)) warning("_hasMask mismatch (case A %d) - please report to Fingolfin", _charset->_hasMask); -// _charset->_hasMask = (_charset->_str.left != -1); } @@ -445,10 +438,9 @@ void ScummEngine::drawString(int a, const byte *msg) { _string[a].xpos = _charset->_str.right + 8; // Indy3: Fixes Grail Diary text positioning if (_version >= 7) { - // FIXME: Remove this and the next three lines eventually! + // FIXME: Remove this and the next two lines eventually! if (!_charset->_hasMask) warning("_hasMask mismatch (case B %d) - please report to Fingolfin", _charset->_hasMask); - _charset->_hasMask = true; } } |