From 52734545b49710f28aae89baa8f230342dce0d59 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Wed, 3 May 2006 04:58:32 +0000
Subject: sfx5 isn't ambient, but manually started/stopped in FF

svn-id: r22292
---
 engines/simon/sound.cpp | 8 --------
 engines/simon/sound.h   | 1 -
 2 files changed, 9 deletions(-)

(limited to 'engines')

diff --git a/engines/simon/sound.cpp b/engines/simon/sound.cpp
index 4a0124002e..1d1c50248c 100644
--- a/engines/simon/sound.cpp
+++ b/engines/simon/sound.cpp
@@ -256,7 +256,6 @@ Sound::Sound(SimonEngine *vm, const GameSpecificSettings *gss, Audio::Mixer *mix
 	_hasVoiceFile = false;
 
 	_ambientPlaying = 0;
-	_sfx5Playing = 0;
 
 	if (_vm->getFeatures() & GF_TALKIE) {
 		loadVoiceFile(gss);
@@ -522,7 +521,6 @@ void Sound::stopVoice() {
 void Sound::stopAll() {
 	_mixer->stopAll();
 	_ambientPlaying = 0;
-	_sfx5Playing = 0;
 }
 
 void Sound::effectsPause(bool b) {
@@ -564,11 +562,6 @@ void Sound::playSfxData(byte *soundData, uint sound, uint pan, uint vol) {
 }
 
 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::playSoundData(Audio::SoundHandle *handle, byte *soundData, uint soun
 }
 
 void Sound::stopSfx5() {
-	_sfx5Playing = 0;
 	_mixer->stopHandle(_sfx5Handle);
 }
 
diff --git a/engines/simon/sound.h b/engines/simon/sound.h
index 9f5d612678..fa8049abf6 100644
--- a/engines/simon/sound.h
+++ b/engines/simon/sound.h
@@ -55,7 +55,6 @@ private:
 	bool _hasEffectsFile;
 	bool _hasVoiceFile;
 	uint _ambientPlaying;
-	uint _sfx5Playing;
 
 public:
 	Sound(SimonEngine *vm, const GameSpecificSettings *gss, Audio::Mixer *mixer);
-- 
cgit v1.2.3