diff options
| author | Travis Howell | 2004-07-17 10:25:22 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-07-17 10:25:22 +0000 |
| commit | 002b9331a8a8f60671fd066d0c25db78a00c94df (patch) | |
| tree | 4cac45dbeb09c133af4381f6c178687536e52f33 /scumm | |
| parent | 5b238e17c1f6ac340ae22928db607aea662967de (diff) | |
| download | scummvm-rg350-002b9331a8a8f60671fd066d0c25db78a00c94df.tar.gz scummvm-rg350-002b9331a8a8f60671fd066d0c25db78a00c94df.tar.bz2 scummvm-rg350-002b9331a8a8f60671fd066d0c25db78a00c94df.zip | |
Minor cleanup
svn-id: r14236
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/resource.cpp | 2 | ||||
| -rw-r--r-- | scumm/verbs.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 7682bb62c1..697bf30308 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -625,7 +625,7 @@ void ScummEngine::ensureResourceLoaded(int type, int i) { loadResource(type, i); - if ((_version <= 6 && _heversion <= 70) && !(_features & GF_SMALL_HEADER)) + if (VAR_ROOM_FLAG != 0xFF) if (type == rtRoom && i == _roomResource) VAR(VAR_ROOM_FLAG) = 1; } diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp index 57552f6f66..d0c2f505bb 100644 --- a/scumm/verbs.cpp +++ b/scumm/verbs.cpp @@ -379,8 +379,7 @@ void ScummEngine::drawVerb(int verb, int mode) { return; } - if (_gameId != GID_FT) - restoreVerbBG(verb); + restoreVerbBG(verb); _string[4].charset = vs->charset_nr; _string[4].xpos = vs->curRect.left; @@ -414,12 +413,15 @@ void ScummEngine::drawVerb(int verb, int mode) { vs->curRect.bottom = _charset->_str.bottom; vs->oldRect = _charset->_str; _charset->_str.left = _charset->_str.right; - } else if (_gameId != GID_FT) { + } else { restoreVerbBG(verb); } } void ScummEngine::restoreVerbBG(int verb) { + if (_gameId == GID_FT) + return; + VerbSlot *vs; vs = &_verbs[verb]; |