COMI/DIG always redraws verbs too

Remove old var, no longer required

svn-id: r14481

4 files changed, 8 insertions, 15 deletions

diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index be4cd973a3..bc59b3bb6d 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -1082,8 +1082,6 @@ void ScummEngine_v8::o8_verbOps() {
 	VerbSlot *vs = NULL;
 	int slot, a, b;
 
-	_verbRedraw = true;
-
 	if (subOp == 0x96) {
 		_curVerb = pop();
 		_curVerbSlot = getVerbSlot(_curVerb, 0);
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
diff --git a/scumm/scumm.h b/scumm/scumm.h
index a8ccc77eb4..00932ca012 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -860,7 +860,7 @@ protected:
 	StripTable *_roomStrips;
 
 	//ender: fullscreen
-	bool _fullRedraw, _BgNeedsRedraw, _verbRedraw;
+	bool _fullRedraw, _BgNeedsRedraw;
 	bool _screenEffectFlag, _completeScreenRedraw;
 
 	struct {
diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp
index 19952ad14f..5b1d66aa88 100644
--- a/scumm/verbs.cpp
+++ b/scumm/verbs.cpp
@@ -265,7 +265,7 @@ void ScummEngine::redrawVerbs() {
 		return;
 
 	int i, verb = 0;
-	if ((_gameId == GID_FT) || _cursor.state > 0)
+	if (_version >= 7 || _cursor.state > 0)
 		verb = checkMouseOver(_mouse.x, _mouse.y);
 
 	for (i = _numVerbs-1; i >= 0; i--) {
@@ -419,7 +419,7 @@ void ScummEngine::drawVerb(int verb, int mode) {
 }
 
 void ScummEngine::restoreVerbBG(int verb) {
-	if (_gameId == GID_FT || _gameId == GID_CMI)
+	if (_version >= 7)
 		return;
 
 	VerbSlot *vs;
@@ -521,7 +521,7 @@ void ScummEngine::killVerb(int slot) {
 
 	nukeResource(rtVerb, slot);
 
-	if (vs->saveid == 0) {
+	if (_version <= 6 && vs->saveid == 0) {
 		drawVerb(slot, 0);
 		verbMouseOver(0);
 	}