[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.66,2.67 verbs.cpp,1.25,1.26

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv17285

Modified Files:
	scummvm.cpp verbs.cpp 
Log Message:
fixed verb regression in older games

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.66
retrieving revision 2.67
diff -u -d -r2.66 -r2.67
--- scummvm.cpp	28 Mar 2003 19:11:14 -0000	2.66
+++ scummvm.cpp	29 Mar 2003 20:48:57 -0000	2.67
@@ -598,7 +598,10 @@
 		_completeScreenRedraw = false;
 		gdi.clearUpperMask();
 		_charset->_hasMask = false;
-		redrawVerbs();
+		for (int i = 0; i < _maxVerbs; i++)
+			drawVerb(i, 0);
+		verbMouseOver(0);
+		_verbRedraw = false;
 		_fullRedraw = true;
 	}
 

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- verbs.cpp	28 Mar 2003 19:11:16 -0000	1.25
+++ verbs.cpp	29 Mar 2003 20:48:57 -0000	1.26
@@ -29,7 +29,7 @@
 
 void Scumm::redrawVerbs() {
 	int i;
-	int verb = checkMouseOver(mouse.x, mouse.y);
+	int verb = (_cursor.state > 0 ? checkMouseOver(mouse.x, mouse.y) : 0);
 	for (i = _maxVerbs-1; i >= 0; i--) {
 		if (i == verb && _verbs[verb].hicolor)
 			drawVerb(i, 1);