[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.158,1.159

[Jamieson Christian]

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

Modified Files:
	script_v6.cpp 
Log Message:
Removed S&M Bumpusville hack made unnecessary by
another fix (presumably the BOT Diner fix).

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- script_v6.cpp	11 Jun 2003 21:45:47 -0000	1.158
+++ script_v6.cpp	12 Jun 2003 19:06:52 -0000	1.159
@@ -2047,17 +2047,6 @@
 			break;
 		return;
 	case 169:
-		// 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 (VAR(VAR_HAVE_MSG))
 			break;
 		return;