[Scummvm-cvs-logs] CVS: scummvm/scumm verbs.cpp,1.103,1.104

Travis Howell kirben at users.sourceforge.net
Sat Aug 14 03:39:07 CEST 2004


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

Modified Files:
	verbs.cpp 
Log Message:

Fix verbs on computer terminals in FT


Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- verbs.cpp	10 Aug 2004 06:13:25 -0000	1.103
+++ verbs.cpp	14 Aug 2004 10:38:34 -0000	1.104
@@ -265,7 +265,7 @@
 		return;
 
 	int i, verb = 0;
-	if (_version >= 7 || _cursor.state > 0)
+	if (_cursor.state > 0)
 		verb = checkMouseOver(_mouse.x, _mouse.y);
 
 	for (i = 0; i < _numVerbs; i++) {
@@ -413,7 +413,7 @@
 		vs->curRect.bottom = _charset->_str.bottom;
 		vs->oldRect = _charset->_str;
 		_charset->_str.left = _charset->_str.right;
-	} else {
+	} else if (_version < 7) {
 		restoreVerbBG(verb);
 	}
 }
@@ -424,7 +424,9 @@
 
 	vs = &_verbs[verb];
 
-	if (vs->oldRect.left != -1) {
+	if (_version >= 7) {
+		restoreBG(vs->curRect, vs->bkcolor);
+	} else if (vs->oldRect.left != -1) {
 		restoreBG(vs->oldRect, vs->bkcolor);
 		vs->oldRect.left = -1;
 	}





More information about the Scummvm-git-logs mailing list