diff options
| author | Travis Howell | 2003-08-29 07:07:55 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-08-29 07:07:55 +0000 |
| commit | ef4fdd03f008fd096b7e34c6015b1b80020e329b (patch) | |
| tree | 9484bc1999f173b39ddb8d7c75eb3f84d2deeb37 /scumm | |
| parent | bed0061362e9202ad7605297d16b5489dcd956ce (diff) | |
| download | scummvm-rg350-ef4fdd03f008fd096b7e34c6015b1b80020e329b.tar.gz scummvm-rg350-ef4fdd03f008fd096b7e34c6015b1b80020e329b.tar.bz2 scummvm-rg350-ef4fdd03f008fd096b7e34c6015b1b80020e329b.zip | |
My last commit was wrong, this is correct solution.
svn-id: r9908
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scummvm.cpp | 6 | ||||
| -rw-r--r-- | scumm/verbs.cpp | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index dd43190427..12b4c8464e 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1290,10 +1290,8 @@ load_game: _completeScreenRedraw = false; gdi.clearCharsetMask(); _charset->_hasMask = false; - if (_version > 2) { - for (int i = 0; i < _maxVerbs; i++) - drawVerb(i, 0); - } + for (int i = 0; i < _maxVerbs; i++) + drawVerb(i, 0); verbMouseOver(0); if (_version <= 2) { diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp index 82cc289562..c5981a1f10 100644 --- a/scumm/verbs.cpp +++ b/scumm/verbs.cpp @@ -359,6 +359,9 @@ int Scumm::checkMouseOver(int x, int y) const { } void Scumm::drawVerb(int verb, int mode) { + if (_version <= 2 && !(_userState & 128)) // Don't draw verbs unless active + return; + VerbSlot *vs; bool tmp; |