[Scummvm-cvs-logs] CVS: scummvm/sword1 logic.cpp,1.54.2.1,1.54.2.2

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Wed Nov 2 07:55:12 CET 2005


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

Modified Files:
      Tag: branch-0-8-0
	logic.cpp 
Log Message:
Backported the "turn off sound at cutscenes" fix.


Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/logic.cpp,v
retrieving revision 1.54.2.1
retrieving revision 1.54.2.2
diff -u -d -r1.54.2.1 -r1.54.2.2
--- logic.cpp	18 Oct 2005 02:11:27 -0000	1.54.2.1
+++ logic.cpp	2 Nov 2005 15:34:10 -0000	1.54.2.2
@@ -942,6 +942,10 @@
 
 int Logic::fnPlaySequence(Object *cpt, int32 id, int32 sequenceId, int32 d, int32 e, int32 f, int32 z, int32 x) {
 
+	// A cutscene usually (always?) means the room will change. In the
+	// meantime, we don't want any looping sound effects still playing.
+	_sound->quitScreen();
+
 	if ((SwordEngine::_systemVars.cutscenePackVersion == 1) && (sequenceId == SEQ_CREDITS)) {
 		CreditsPlayer player(_system, _mixer);
 		player.play();





More information about the Scummvm-git-logs mailing list