diff options
author | Travis Howell | 2004-07-03 13:32:56 +0000 |
---|---|---|
committer | Travis Howell | 2004-07-03 13:32:56 +0000 |
commit | 7927f8574e0cab97c7ee7e9dfa4f6d124a359400 (patch) | |
tree | 7e0865cddc1f3453c710e691debec976c4ac4fe4 /scumm/scumm.cpp | |
parent | 40eea5d38677c65cb931973e8a6176f149c6e5b1 (diff) | |
download | scummvm-rg350-7927f8574e0cab97c7ee7e9dfa4f6d124a359400.tar.gz scummvm-rg350-7927f8574e0cab97c7ee7e9dfa4f6d124a359400.tar.bz2 scummvm-rg350-7927f8574e0cab97c7ee7e9dfa4f6d124a359400.zip |
Add suggested fix for bug #778281 (Solution checked against disasm.)
svn-id: r14159
Diffstat (limited to 'scumm/scumm.cpp')
-rw-r--r-- | scumm/scumm.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index a765a1d8f7..74ff1d2a0f 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1639,6 +1639,12 @@ load_game: setActorRedrawFlags(); } + // Full Throttle needs to draw verbs before actors, to prevent + // flickering with overlapped actors. See bug #778281 + + if (_gameId == GID_FT && !_verbRedraw && _cursor.state > 0) + verbMouseOver(checkMouseOver(_mouse.x, _mouse.y)); + processActors(); _fullRedraw = false; cyclePalette(); @@ -1650,10 +1656,9 @@ load_game: clearClickedStatus(); } - - if (!_verbRedraw && _cursor.state > 0) { + if (_gameId != GID_FT && !_verbRedraw && _cursor.state > 0) verbMouseOver(checkMouseOver(_mouse.x, _mouse.y)); - } + _verbRedraw = false; if (_version <= 2) { |