aboutsummaryrefslogtreecommitdiff
path: root/scumm/verbs.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-09-03 02:08:32 +0000
committerTravis Howell2004-09-03 02:08:32 +0000
commit6bada66d16026428d05d59d8dbf32d51704bbdd7 (patch)
tree3fcad9988e02c210391d13eace8f33cbf77a6f0e /scumm/verbs.cpp
parent077d977834f00758d7484e2e146cad39b2e64a65 (diff)
downloadscummvm-rg350-6bada66d16026428d05d59d8dbf32d51704bbdd7.tar.gz
scummvm-rg350-6bada66d16026428d05d59d8dbf32d51704bbdd7.tar.bz2
scummvm-rg350-6bada66d16026428d05d59d8dbf32d51704bbdd7.zip
Revert verb draw order change.
Fix recent verb regressions. svn-id: r14870
Diffstat (limited to 'scumm/verbs.cpp')
-rw-r--r--scumm/verbs.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp
index 042524dc19..fd9203c2ac 100644
--- a/scumm/verbs.cpp
+++ b/scumm/verbs.cpp
@@ -268,7 +268,7 @@ void ScummEngine::redrawVerbs() {
if (_cursor.state > 0)
verb = checkMouseOver(_mouse.x, _mouse.y);
- for (i = 0; i < _numVerbs; i++) {
+ for (i = _numVerbs-1; i >= 0; i--) {
if (i == verb && _verbs[verb].hicolor)
drawVerb(i, 1);
else
@@ -413,7 +413,7 @@ 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 (_version < 7) {
+ } else if (_gameId != GID_FT) {
restoreVerbBG(verb);
}
}
@@ -424,9 +424,7 @@ void ScummEngine::restoreVerbBG(int verb) {
vs = &_verbs[verb];
- if (_version == 8) {
- // Do nothing
- } else if (_version >= 7) {
+ if (_gameId == GID_FT) {
restoreBG(vs->curRect, vs->bkcolor);
} else if (vs->oldRect.left != -1) {
restoreBG(vs->oldRect, vs->bkcolor);