[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.132,1.133 sound.h,1.22,1.23

Gregory Montoir cyx at users.sourceforge.net
Sun Sep 26 12:00:31 CEST 2004


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

Modified Files:
	cutaway.cpp sound.h 
Log Message:
stop the current sfx from playing if a cutaway is cancelled

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- cutaway.cpp	25 Sep 2004 23:47:10 -0000	1.132
+++ cutaway.cpp	26 Sep 2004 18:55:11 -0000	1.133
@@ -986,9 +986,10 @@
 	joeBob->animating = 0;
 	joeBob->moving    = 0;
 
-	// if the cutaway has been cancelled, we must stop the speech as well
+	// if the cutaway has been cancelled, we must stop the speech and the sfx as well
 	if (_vm->sound()->speechOn())
 		_vm->sound()->stopSpeech();
+	_vm->sound()->stopSfx();
 	
 	_vm->input()->cutawayRunning(false);
 	_vm->input()->cutawayQuitReset();

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sound.h	17 Mar 2004 14:10:51 -0000	1.22
+++ sound.h	26 Sep 2004 18:55:11 -0000	1.23
@@ -60,6 +60,7 @@
 	void playSong(int16 songNum);
 	void playLastSong()		{ playSong(_lastOverride); }
 	void stopSpeech()		{ _mixer->stopHandle(_speechHandle); }
+	void stopSfx()			{ _mixer->stopHandle(_sfxHandle); }
 	
 	bool sfxOn() const		{ return _sfxToggle; }
 	void sfxToggle(bool val)	{ _sfxToggle = val; }





More information about the Scummvm-git-logs mailing list