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

[lordhoto at users.sourceforge.net]

Revision: 31221
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31221&view=rev
Author:   lordhoto
Date:     2008-03-22 07:29:30 -0700 (Sat, 22 Mar 2008)

Log Message:
-----------
- fixed bug in Sound::voiceIsPlaying
- fixed speech animation duration in Kyra1

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound.cpp
    scummvm/trunk/engines/kyra/text_v1.cpp

Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp	2008-03-22 12:43:23 UTC (rev 31220)
+++ scummvm/trunk/engines/kyra/sound.cpp	2008-03-22 14:29:30 UTC (rev 31221)
@@ -135,7 +135,7 @@
 	} else {
 		for (int i = 0; i < kNumChannelHandles; ++i) {
 			if (_soundChannels[i].file == file)
-				res = true;
+				res = _mixer->isSoundHandleActive(_soundChannels[i].channelHandle);
 		}
 	}
 	return res;

Modified: scummvm/trunk/engines/kyra/text_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_v1.cpp	2008-03-22 12:43:23 UTC (rev 31220)
+++ scummvm/trunk/engines/kyra/text_v1.cpp	2008-03-22 14:29:30 UTC (rev 31221)
@@ -110,7 +110,7 @@
 		_animator->copyChangedObjectsForward(0);
 		updateTextFade();
 
-		if ((chatDuration < (int16)(_system->getMillis() - timeAtStart)) && chatDuration != -1 && (!drawText || !snd_voiceIsPlaying()))
+		if (((chatDuration < (int16)(_system->getMillis() - timeAtStart)) && chatDuration != -1 && drawText) || (!drawText && !snd_voiceIsPlaying()))
 			break;
 
 		uint32 nextTime = loopStart + _tickLength;


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