[Scummvm-cvs-logs] CVS: scummvm verbs.cpp,1.26,1.27

Max Horn fingolfin at users.sourceforge.net
Mon May 20 07:44:04 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv16968

Modified Files:
	verbs.cpp 
Log Message:
small tweak, no functionality changed

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/verbs.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- verbs.cpp	15 May 2002 10:25:00 -0000	1.26
+++ verbs.cpp	20 May 2002 14:43:22 -0000	1.27
@@ -116,7 +116,6 @@
 void Scumm::drawVerb(int vrb, int mode)
 {
 	VerbSlot *vs;
-	byte color;
 	byte tmp;
 
 	if (!vrb)
@@ -136,13 +135,13 @@
 		string[4].ypos = vs->y;
 		string[4].right = 319;
 		string[4].center = vs->center;
-		if (mode && vs->hicolor)
-			color = vs->hicolor;
-		else
-			color = vs->color;
-		string[4].color = color;
+
 		if (vs->curmode == 2)
 			string[4].color = vs->dimcolor;
+		else if (mode && vs->hicolor)
+			string[4].color = vs->hicolor;
+		else
+			string[4].color = vs->color;
 
 		// FIXME For the future: Indy3 and under inv scrolling
 		/*





More information about the Scummvm-git-logs mailing list