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

[kirben at users.sourceforge.net]

Revision: 22292
Author:   kirben
Date:     2006-05-02 21:58:32 -0700 (Tue, 02 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22292&view=rev

Log Message:
-----------
sfx5 isn't ambient, but manually started/stopped in FF

Modified Paths:
--------------
    scummvm/trunk/engines/simon/sound.cpp
    scummvm/trunk/engines/simon/sound.h
Modified: scummvm/trunk/engines/simon/sound.cpp
===================================================================
--- scummvm/trunk/engines/simon/sound.cpp	2006-05-03 04:39:31 UTC (rev 22291)
+++ scummvm/trunk/engines/simon/sound.cpp	2006-05-03 04:58:32 UTC (rev 22292)
@@ -256,7 +256,6 @@
 	_hasVoiceFile = false;
 
 	_ambientPlaying = 0;
-	_sfx5Playing = 0;
 
 	if (_vm->getFeatures() & GF_TALKIE) {
 		loadVoiceFile(gss);
@@ -522,7 +521,6 @@
 void Sound::stopAll() {
 	_mixer->stopAll();
 	_ambientPlaying = 0;
-	_sfx5Playing = 0;
 }
 
 void Sound::effectsPause(bool b) {
@@ -564,11 +562,6 @@
 }
 
 void Sound::playSfx5Data(byte *soundData, uint sound, uint pan, uint vol) {
-	if (sound == _sfx5Playing)
-		return;
-
-	_sfx5Playing = sound;
-
 	if (_sfx5Paused)
 		return;
 
@@ -642,7 +635,6 @@
 }
 
 void Sound::stopSfx5() {
-	_sfx5Playing = 0;
 	_mixer->stopHandle(_sfx5Handle);
 }
 

Modified: scummvm/trunk/engines/simon/sound.h
===================================================================
--- scummvm/trunk/engines/simon/sound.h	2006-05-03 04:39:31 UTC (rev 22291)
+++ scummvm/trunk/engines/simon/sound.h	2006-05-03 04:58:32 UTC (rev 22292)
@@ -55,7 +55,6 @@
 	bool _hasEffectsFile;
 	bool _hasVoiceFile;
 	uint _ambientPlaying;
-	uint _sfx5Playing;
 
 public:
 	Sound(SimonEngine *vm, const GameSpecificSettings *gss, Audio::Mixer *mixer);


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