[Scummvm-cvs-logs] SF.net SVN: scummvm:[40299] scummvm/trunk/engines/agos

[Kirben at users.sourceforge.net]

Revision: 40299
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40299&view=rev
Author:   Kirben
Date:     2009-05-04 09:17:31 +0000 (Mon, 04 May 2009)

Log Message:
-----------
Fix the car chase scene in PN.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/event.cpp
    scummvm/trunk/engines/agos/sound.cpp
    scummvm/trunk/engines/agos/sound.h

Modified: scummvm/trunk/engines/agos/event.cpp
===================================================================
--- scummvm/trunk/engines/agos/event.cpp	2009-05-04 09:16:00 UTC (rev 40298)
+++ scummvm/trunk/engines/agos/event.cpp	2009-05-04 09:17:31 UTC (rev 40299)
@@ -620,7 +620,7 @@
 
 	_videoLockOut |= 2;
 
-	_sound->handleSound();
+	_sound->handleSoundQueue();
 	handleMouseMoved();
 	handleKeyboard();
 

Modified: scummvm/trunk/engines/agos/sound.cpp
===================================================================
--- scummvm/trunk/engines/agos/sound.cpp	2009-05-04 09:16:00 UTC (rev 40298)
+++ scummvm/trunk/engines/agos/sound.cpp	2009-05-04 09:17:31 UTC (rev 40299)
@@ -700,12 +700,17 @@
 }
 
 // Personal Nightmare specific
-void Sound::handleSound() {
-	if (_soundQueuePtr && !isSfxActive()) {
+void Sound::handleSoundQueue() {
+	if (isSfxActive())
+		return;
+
+	_vm->_sampleEnd = 1;
+
+	if (_soundQueuePtr) {
 		playRawData(_soundQueuePtr, _soundQueueNum, _soundQueueSize, _soundQueueFreq);
 
 		_vm->_sampleWait = 1;
-		_vm->_sampleEnd = 1;
+		_vm->_sampleEnd = 0;
 		_soundQueuePtr = 0;
 		_soundQueueNum = 0;
 		_soundQueueSize = 0;

Modified: scummvm/trunk/engines/agos/sound.h
===================================================================
--- scummvm/trunk/engines/agos/sound.h	2009-05-04 09:16:00 UTC (rev 40298)
+++ scummvm/trunk/engines/agos/sound.h	2009-05-04 09:17:31 UTC (rev 40299)
@@ -90,7 +90,7 @@
 	void playAmbient(uint sound);
 
 	// Personal Nightmare specfic
-	void handleSound();
+	void handleSoundQueue();
 	void queueSound(byte *ptr, uint16 sound, uint32 size, uint16 freq);
 
 	// Elvira 1/2 and Waxworks specific


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