[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.131,1.132

Gregory Montoir cyx at users.sourceforge.net
Sat Sep 25 16:54:14 CEST 2004


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

Modified Files:
	cutaway.cpp 
Log Message:
fix for bug #1034707

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- cutaway.cpp	24 Aug 2004 16:31:45 -0000	1.131
+++ cutaway.cpp	25 Sep 2004 23:47:10 -0000	1.132
@@ -986,6 +986,10 @@
 	joeBob->animating = 0;
 	joeBob->moving    = 0;
 
+	// if the cutaway has been cancelled, we must stop the speech as well
+	if (_vm->sound()->speechOn())
+		_vm->sound()->stopSpeech();
+	
 	_vm->input()->cutawayRunning(false);
 	_vm->input()->cutawayQuitReset();
 	_vm->input()->quickSaveReset();





More information about the Scummvm-git-logs mailing list