[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.163,1.164 verbs.cpp,1.106,1.107

[Travis Howell]

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

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

Revert verb draw order change.
Fix recent verb regressions.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- scumm.cpp	31 Aug 2004 07:32:53 -0000	1.163
+++ scumm.cpp	3 Sep 2004 02:08:32 -0000	1.164
@@ -1736,7 +1736,7 @@
 		processDrawQue();
 
 		// Full Throttle always redraws verbs and draws verbs before actors
-		if (_gameId == GID_FT)
+		if (_version >= 7)
 			redrawVerbs();
 	
 		setActorRedrawFlags();
@@ -1754,9 +1754,6 @@
 		if (_version >= 4 && _heversion <= 60)
 			cyclePalette();
 		palManipulate();
-		if (_gameId == GID_DIG || _gameId == GID_CMI)
-			redrawVerbs();
-
 		if (_doEffect) {
 			_doEffect = false;
 			fadeIn(_newEffect);

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- verbs.cpp	28 Aug 2004 13:30:59 -0000	1.106
+++ verbs.cpp	3 Sep 2004 02:08:32 -0000	1.107
@@ -268,7 +268,7 @@
 	if (_cursor.state > 0)
 		verb = checkMouseOver(_mouse.x, _mouse.y);
 
-	for (i = 0; i < _numVerbs; i++) {
+	for (i = _numVerbs-1; i >= 0; i--) {
 		if (i == verb && _verbs[verb].hicolor)
 			drawVerb(i, 1);
 		else
@@ -413,7 +413,7 @@
 		vs->curRect.bottom = _charset->_str.bottom;
 		vs->oldRect = _charset->_str;
 		_charset->_str.left = _charset->_str.right;
-	} else if (_version < 7) {
+	} else if (_gameId != GID_FT) {
 		restoreVerbBG(verb);
 	}
 }
@@ -424,9 +424,7 @@
 
 	vs = &_verbs[verb];
 
-	if (_version == 8) {
-		// Do nothing
-	} else if (_version >= 7) {
+	if (_gameId == GID_FT) {
 		restoreBG(vs->curRect, vs->bkcolor);
 	} else if (vs->oldRect.left != -1) {
 		restoreBG(vs->oldRect, vs->bkcolor);