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

[lordhoto at users.sourceforge.net]

Revision: 31252
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31252&view=rev
Author:   lordhoto
Date:     2008-03-26 14:39:44 -0700 (Wed, 26 Mar 2008)

Log Message:
-----------
- fixed multiple voices playing at once (see bug #1926547 "HoF: Right mouse button messes up gameplay").
- fixed crash while uninitializing AdLib driver

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v2.cpp
    scummvm/trunk/engines/kyra/sound_adlib.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-26 21:28:26 UTC (rev 31251)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-26 21:39:44 UTC (rev 31252)
@@ -1734,10 +1734,13 @@
 	assert(id >= 0 && id <= 9999999);
 	sprintf(vocFile, "%07d", id);
 	if (_sound->voiceFileIsPresent(vocFile)) {
+		snd_stopVoice();
+
 		while (!_sound->voicePlay(vocFile)) {
 			updateWithText();
 			_system->delayMillis(10);
 		}
+
 		_speechFile = vocFile;
 	}
 }

Modified: scummvm/trunk/engines/kyra/sound_adlib.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.cpp	2008-03-26 21:28:26 UTC (rev 31251)
+++ scummvm/trunk/engines/kyra/sound_adlib.cpp	2008-03-26 21:39:44 UTC (rev 31252)
@@ -2229,8 +2229,8 @@
 }
 
 SoundAdlibPC::~SoundAdlibPC() {
+	delete _driver;
 	delete [] _soundDataPtr;
-	delete _driver;
 }
 
 bool SoundAdlibPC::init() {


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