diff options
author | Travis Howell | 2004-08-06 06:19:14 +0000 |
---|---|---|
committer | Travis Howell | 2004-08-06 06:19:14 +0000 |
commit | e8a10c219e49cc1081bb44dad0439c053207760e (patch) | |
tree | 0e2928a6fd993648d909e11aaf126b17520123e0 /scumm/scumm.cpp | |
parent | fac44fbfec7eea4dfa8ca5315d6c51c0368946a9 (diff) | |
download | scummvm-rg350-e8a10c219e49cc1081bb44dad0439c053207760e.tar.gz scummvm-rg350-e8a10c219e49cc1081bb44dad0439c053207760e.tar.bz2 scummvm-rg350-e8a10c219e49cc1081bb44dad0439c053207760e.zip |
COMI/DIG always redraws verbs too
Remove old var, no longer required
svn-id: r14481
Diffstat (limited to 'scumm/scumm.cpp')
-rw-r--r-- | scumm/scumm.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index b779fbf9e3..c559ea1ace 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -566,7 +566,6 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS _PALS_offs = 0; _fullRedraw = false; _BgNeedsRedraw = false; - _verbRedraw = false; _screenEffectFlag = false; _completeScreenRedraw = false; memset(&_cursor, 0, sizeof(_cursor)); @@ -1054,8 +1053,6 @@ void ScummEngine::launch() { #endif _minHeapThreshold = 400000; - _verbRedraw = false; - allocResTypeData(rtBuffer, MKID('NONE'), 10, "buffer", 0); setupScummVars(); @@ -1650,7 +1647,6 @@ load_game: checkV2MouseOver(_mouse); } - _verbRedraw = false; _fullRedraw = true; } @@ -1688,9 +1684,8 @@ load_game: processDrawQue(); // Full Throttle always redraws verbs and draws verbs before actors - if ((_gameId == GID_FT) || _verbRedraw) { + if (_gameId == GID_FT) redrawVerbs(); - } setActorRedrawFlags(); resetActorBgs(); @@ -1707,6 +1702,8 @@ load_game: if (_version >= 4 && _heversion <= 60) cyclePalette(); palManipulate(); + if (_gameId == GID_DIG || _gameId == GID_CMI) + redrawVerbs(); if (_doEffect) { _doEffect = false; @@ -1714,11 +1711,9 @@ load_game: clearClickedStatus(); } - if (!_verbRedraw && _cursor.state > 0) + if (_cursor.state > 0) verbMouseOver(checkMouseOver(_mouse.x, _mouse.y)); - _verbRedraw = false; - if (_version <= 2) { if (oldEgo != VAR(VAR_EGO)) { // FIXME/TODO: Reset and redraw the sentence line |