[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.76,1.77

[Travis Howell]

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

Modified Files:
	scumm.cpp 
Log Message:

Add suggested fix for bug #778281 (Solution checked against disasm.)


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- scumm.cpp	3 Jul 2004 11:37:26 -0000	1.76
+++ scumm.cpp	3 Jul 2004 13:32:56 -0000	1.77
@@ -1639,6 +1639,12 @@
 			setActorRedrawFlags();
 		}
 
+		// Full Throttle needs to draw verbs before actors, to prevent
+		// flickering with overlapped actors. See bug #778281
+
+		if (_gameId == GID_FT && !_verbRedraw && _cursor.state > 0)
+			verbMouseOver(checkMouseOver(_mouse.x, _mouse.y));
+
 		processActors();
 		_fullRedraw = false;
 		cyclePalette();
@@ -1650,10 +1656,9 @@
 			clearClickedStatus();
 		}
 
-
-		if (!_verbRedraw && _cursor.state > 0) {
+		if (_gameId != GID_FT && !_verbRedraw && _cursor.state > 0)
 			verbMouseOver(checkMouseOver(_mouse.x, _mouse.y));
-		}
+
 		_verbRedraw = false;
 
 		if (_version <= 2) {