[Scummvm-cvs-logs] SF.net SVN: scummvm: [22697] scummvm/trunk/engines/kyra

[vinterstum at users.sourceforge.net]

Revision: 22697
Author:   vinterstum
Date:     2006-05-27 21:46:34 -0700 (Sat, 27 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22697&view=rev

Log Message:
-----------
Fix for [ 1472007 ] KYRA1: Bypassing cutscenes with ESC doesn't stop speech

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sequences_v1.cpp
    scummvm/trunk/engines/kyra/sound.cpp
    scummvm/trunk/engines/kyra/sound.h
Modified: scummvm/trunk/engines/kyra/sequences_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v1.cpp	2006-05-28 04:08:25 UTC (rev 22696)
+++ scummvm/trunk/engines/kyra/sequences_v1.cpp	2006-05-28 04:46:34 UTC (rev 22697)
@@ -118,6 +118,7 @@
 	delay(30 * _tickLength);
 	_seq->setCopyViewOffs(false);
 	_sound->haltTrack();
+	_sound->voiceStop();
 	if (_features & GF_TALKIE) {
 		_res->unloadPakFile("INTRO.VRM");
 	}

Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp	2006-05-28 04:08:25 UTC (rev 22696)
+++ scummvm/trunk/engines/kyra/sound.cpp	2006-05-28 04:46:34 UTC (rev 22697)
@@ -81,6 +81,10 @@
 	fileSize = 0;
 }
 
+void Sound::voiceStop() {
+	_mixer->stopHandle(_vocHandle);
+}
+
 bool Sound::voiceIsPlaying() {
 	return _mixer->isSoundHandleActive(_vocHandle);
 }

Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h	2006-05-28 04:08:25 UTC (rev 22696)
+++ scummvm/trunk/engines/kyra/sound.h	2006-05-28 04:46:34 UTC (rev 22697)
@@ -64,7 +64,8 @@
 	void voicePlay(const char *file);
 	void voiceUnload() {}
 	bool voiceIsPlaying();
-
+	void voiceStop();
+	
 protected:
 	KyraEngine *_engine;
 	Audio::Mixer *_mixer;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.