[Scummvm-cvs-logs] SF.net SVN: scummvm: [22007] scummvm/trunk/engines/simon

[kirben at users.sourceforge.net]

Revision: 22007
Author:   kirben
Date:     2006-04-18 06:28:42 -0700 (Tue, 18 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22007&view=rev

Log Message:
-----------
Add code for vc84_stopSoundLoop in FF

Modified Paths:
--------------
    scummvm/trunk/engines/simon/sound.cpp
    scummvm/trunk/engines/simon/sound.h
    scummvm/trunk/engines/simon/vga.cpp
Modified: scummvm/trunk/engines/simon/sound.cpp
===================================================================
--- scummvm/trunk/engines/simon/sound.cpp	2006-04-18 12:55:01 UTC (rev 22006)
+++ scummvm/trunk/engines/simon/sound.cpp	2006-04-18 13:28:42 UTC (rev 22007)
@@ -589,6 +589,11 @@
 	_mixer->playRaw(&_voiceHandle, buffer, size, rate, flags);
 }
 
+void Sound::stopSfx5() {
+	_sfx5Playing = 0;
+	_mixer->stopHandle(_sfx5Handle);
+}
+
 void Sound::switchVoiceFile(uint disc) {
 	if (_lastVoiceFile != disc) {
 		stopAll();

Modified: scummvm/trunk/engines/simon/sound.h
===================================================================
--- scummvm/trunk/engines/simon/sound.h	2006-04-18 12:55:01 UTC (rev 22006)
+++ scummvm/trunk/engines/simon/sound.h	2006-04-18 13:28:42 UTC (rev 22007)
@@ -82,6 +82,7 @@
 
 	bool hasVoice() const;
 	bool isVoiceActive() const;
+	void stopSfx5();
 	void stopVoice();
 	void stopAll();
 	void effectsPause(bool b);

Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp	2006-04-18 12:55:01 UTC (rev 22006)
+++ scummvm/trunk/engines/simon/vga.cpp	2006-04-18 13:28:42 UTC (rev 22007)
@@ -2459,7 +2459,7 @@
 
 	uint16 var = vcReadNextWord();
 
-	if (getBitFlag(82) == true) {
+	if (getBitFlag(82)) {
 		val = _pathValues1[_GPVCount1++];
 	} else {
 		val = _pathValues[_GPVCount++];
@@ -2477,8 +2477,7 @@
 }
 
 void SimonEngine::vc84_stopSoundLoop() {
-	// Stop looping sound effect
-	debug(0, "STUB: vc84_stopSoundLoop");
+	_sound->stopSfx5();
 }
 
 // Scrolling functions for Feeble Files


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