[Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.cpp,1.59,1.60

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv886/driver

Modified Files:
	animation.cpp 
Log Message:
Don't wait for the lead-out sound to finish when playing the "shaman"
cutscene, as it's obviously meant to blend in with the rest of the game.


Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- animation.cpp	12 Mar 2005 18:56:09 -0000	1.59
+++ animation.cpp	24 Apr 2005 15:38:53 -0000	1.60
@@ -207,10 +207,15 @@
 
 	_snd->stopHandle(leadInHandle);
 
-	// Wait for the lead-out to stop, if there is any.
-	while (_vm->_mixer->isSoundHandleActive(_leadOutHandle)) {
-		_vm->_screen->updateDisplay();
-		_vm->_system->delayMillis(30);
+	// Wait for the lead-out to stop, if there is any. Though don't do it
+	// for the "shaman" cutscene as it's obviously meant to blend into the
+	// rest of the game, and the lead-out goes on for a long time.
+
+	if (scumm_stricmp(filename, "shaman") != 0) {
+		while (_vm->_mixer->isSoundHandleActive(_leadOutHandle)) {
+			_vm->_screen->updateDisplay();
+			_vm->_system->delayMillis(30);
+		}
 	}
 
 	if (leadInRes)