[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.358,2.359 verbs.cpp,1.74,1.75

[Travis Howell]

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

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

My last commit was wrong, this is correct solution.


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.358
retrieving revision 2.359
diff -u -d -r2.358 -r2.359
--- scummvm.cpp	29 Aug 2003 06:53:00 -0000	2.358
+++ scummvm.cpp	29 Aug 2003 07:07:55 -0000	2.359
@@ -1290,10 +1290,8 @@
 		_completeScreenRedraw = false;
 		gdi.clearCharsetMask();
 		_charset->_hasMask = false;
-		if (_version > 2) {
-			for (int i = 0; i < _maxVerbs; i++)
-				drawVerb(i, 0);
-		}
+		for (int i = 0; i < _maxVerbs; i++)
+			drawVerb(i, 0);
 		verbMouseOver(0);
 
 		if (_version <= 2) {

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- verbs.cpp	24 Aug 2003 02:27:52 -0000	1.74
+++ verbs.cpp	29 Aug 2003 07:07:55 -0000	1.75
@@ -359,6 +359,9 @@
 }
 
 void Scumm::drawVerb(int verb, int mode) {
+	if (_version <= 2 && !(_userState & 128)) // Don't draw verbs unless active
+		return;
+
 	VerbSlot *vs;
 	bool tmp;