[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.133,1.134

[Gregory Montoir]

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

Modified Files:
	cutaway.cpp 
Log Message:
as pointed out by salty-horse, it's better to stop speech and sfx only when the cutaway is cancelled

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- cutaway.cpp	26 Sep 2004 18:55:11 -0000	1.133
+++ cutaway.cpp	3 Oct 2004 20:27:39 -0000	1.134
@@ -917,8 +917,6 @@
 
 	stop();
 
-	_vm->input()->cutawayQuitReset();
-
 	updateGameState();
 
 	_vm->bankMan()->close(CUTAWAY_BANK);
@@ -987,9 +985,11 @@
 	joeBob->moving    = 0;
 
 	// 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();
+	if (_vm->input()->cutawayQuit()) {
+		if (_vm->sound()->speechOn())
+			_vm->sound()->stopSpeech();
+		_vm->sound()->stopSfx();
+	}
 	
 	_vm->input()->cutawayRunning(false);
 	_vm->input()->cutawayQuitReset();