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

[Max Horn]

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

Modified Files:
	scummvm.cpp verbs.cpp 
Log Message:
fixed verb drawing in COMI (and maybe FT, too?)

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.65
retrieving revision 2.66
diff -u -d -r2.65 -r2.66
--- scummvm.cpp	25 Mar 2003 15:55:25 -0000	2.65
+++ scummvm.cpp	28 Mar 2003 19:11:14 -0000	2.66
@@ -633,8 +633,9 @@
 
 		processDrawQue();
 
-		if (_verbRedraw)
+		if (_verbRedraw) {
 			redrawVerbs();
+		}
 		
 		setActorRedrawFlags(true, true);
 		resetActorBgs();
@@ -656,9 +657,10 @@
 			clearClickedStatus();
 		}
 
-		if (_cursor.state > 0) {
+		if (!_verbRedraw && _cursor.state > 0) {
 			verbMouseOver(checkMouseOver(mouse.x, mouse.y));
 		}
+		_verbRedraw = false;
 
 		drawBlastObjects();
 		if (_features & GF_AFTER_V8)

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- verbs.cpp	6 Mar 2003 21:46:31 -0000	1.24
+++ verbs.cpp	28 Mar 2003 19:11:16 -0000	1.25
@@ -29,10 +29,14 @@
 
 void Scumm::redrawVerbs() {
 	int i;
-	for (i = 0; i < _maxVerbs; i++)
-		drawVerb(i, 0);
-	verbMouseOver(0);
-	_verbRedraw = false;
+	int verb = checkMouseOver(mouse.x, mouse.y);
+	for (i = _maxVerbs-1; i >= 0; i--) {
+		if (i == verb && _verbs[verb].hicolor)
+			drawVerb(i, 1);
+		else
+			drawVerb(i, 0);
+	}
+	_verbMouseOver = verb;
 }
 
 void Scumm::checkExecVerbs() {
@@ -127,10 +131,7 @@
 			return;
 		}
 		
-		// FIXME: Commenting this out fixes some drawing glitches,
-		// but TOTALLY screws up scrolling conversation items.
-		//if (_gameId != GID_CMI)
-			restoreVerbBG(verb);
+		restoreVerbBG(verb);
 
 		_string[4].charset = vs->charset_nr;
 		_string[4].xpos = vs->x;