[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,1.49,1.50

[Jamieson Christian]

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

Modified Files:
	script_v2.cpp 
Log Message:
Hack to prevent animation hangs during Conroy's song in Sam & Max.

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- script_v2.cpp	6 Nov 2002 16:44:57 -0000	1.49
+++ script_v2.cpp	10 Nov 2002 18:29:59 -0000	1.50
@@ -2037,7 +2037,16 @@
 			return;
 		}
 	case 169:
-		//printf("waiting for message: %d\n", _vars[VAR_HAVE_MSG]);
+		// HACK: For Conroy Bumpus' song in Sam & Max.
+		// During the song three calls to o6_wait() appear,
+		// but because of the way in which the actor talk is done
+		// and the fact that the song extends beyond the span
+		// of each individual line, no end-of-talk is ever
+		// detected and the script hangs on o6_wait().
+		if (_gameId == GID_SAMNMAX && vm.slot[_currentScript].number == 99 && _sound->isSoundRunning (64)) {
+			debug (2, "Sam & Max hack: Bypassing o6_wait() during Conroy's song.");
+			return;
+		}
 
 		if (_vars[VAR_HAVE_MSG])
 			break;