[Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.263,2.264 scumm.cpp,1.114,1.115 scumm.h,1.436,1.437 verbs.cpp,1.100,1.101

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31273/scumm

Modified Files:
	script_v8.cpp scumm.cpp scumm.h verbs.cpp 
Log Message:

COMI/DIG always redraws verbs too
Remove old var, no longer required


Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.263
retrieving revision 2.264
diff -u -d -r2.263 -r2.264
--- script_v8.cpp	1 Aug 2004 06:52:45 -0000	2.263
+++ script_v8.cpp	6 Aug 2004 06:19:13 -0000	2.264
@@ -1082,8 +1082,6 @@
 	VerbSlot *vs = NULL;
 	int slot, a, b;
 
-	_verbRedraw = true;
-
 	if (subOp == 0x96) {
 		_curVerb = pop();
 		_curVerbSlot = getVerbSlot(_curVerb, 0);

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- scumm.cpp	6 Aug 2004 02:10:23 -0000	1.114
+++ scumm.cpp	6 Aug 2004 06:19:14 -0000	1.115
@@ -566,7 +566,6 @@
 	_PALS_offs = 0;
 	_fullRedraw = false;
 	_BgNeedsRedraw = false;
-	_verbRedraw = false;
 	_screenEffectFlag = false;
 	_completeScreenRedraw = false;
 	memset(&_cursor, 0, sizeof(_cursor));
@@ -1054,8 +1053,6 @@
 #endif
 	_minHeapThreshold = 400000;
 
-	_verbRedraw = false;
-
 	allocResTypeData(rtBuffer, MKID('NONE'), 10, "buffer", 0);
 
 	setupScummVars();
@@ -1650,7 +1647,6 @@
 			checkV2MouseOver(_mouse);
 		}
 
-		_verbRedraw = false;
 		_fullRedraw = true;
 	}
 
@@ -1688,9 +1684,8 @@
 		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 @@
 		if (_version >= 4 && _heversion <= 60)
 			cyclePalette();
 		palManipulate();
+		if (_gameId == GID_DIG || _gameId == GID_CMI)
+			redrawVerbs();
 
 		if (_doEffect) {
 			_doEffect = false;
@@ -1714,11 +1711,9 @@
 			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

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -d -r1.436 -r1.437
--- scumm.h	1 Aug 2004 13:57:00 -0000	1.436
+++ scumm.h	6 Aug 2004 06:19:14 -0000	1.437
@@ -860,7 +860,7 @@
 	StripTable *_roomStrips;
 
 	//ender: fullscreen
-	bool _fullRedraw, _BgNeedsRedraw, _verbRedraw;
+	bool _fullRedraw, _BgNeedsRedraw;
 	bool _screenEffectFlag, _completeScreenRedraw;
 
 	struct {

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- verbs.cpp	5 Aug 2004 22:10:42 -0000	1.100
+++ verbs.cpp	6 Aug 2004 06:19:14 -0000	1.101
@@ -265,7 +265,7 @@
 		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::restoreVerbBG(int verb) {
-	if (_gameId == GID_FT || _gameId == GID_CMI)
+	if (_version >= 7)
 		return;
 
 	VerbSlot *vs;
@@ -521,7 +521,7 @@
 
 	nukeResource(rtVerb, slot);
 
-	if (vs->saveid == 0) {
+	if (_version <= 6 && vs->saveid == 0) {
 		drawVerb(slot, 0);
 		verbMouseOver(0);
 	}