From 3c3ff0a3aab13b876e0425c365402ff334743282 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sat, 27 Dec 2014 16:46:33 +0100 Subject: ACCESS: Remove two useless variables --- engines/access/scripts.cpp | 2 +- engines/access/sound.cpp | 2 -- engines/access/sound.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp index 074c781352..1bd24894d7 100644 --- a/engines/access/scripts.cpp +++ b/engines/access/scripts.cpp @@ -794,7 +794,7 @@ void Scripts::cmdFreeSound() { charLoop(); _vm->_events->pollEvents(); - } while (!_vm->shouldQuit() && sound._playingSound); + } while (!_vm->shouldQuit() && sound.isSFXPlaying()); // Free the sounds while (sound._soundTable.size() > 0) { diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp index cfc8b7a64c..fc574dc083 100644 --- a/engines/access/sound.cpp +++ b/engines/access/sound.cpp @@ -30,8 +30,6 @@ namespace Access { SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) { - _playingSound = false; - _isVoice = false; } SoundManager::~SoundManager() { diff --git a/engines/access/sound.h b/engines/access/sound.h index 3646c2cc16..384e9ac615 100644 --- a/engines/access/sound.h +++ b/engines/access/sound.h @@ -56,8 +56,6 @@ private: void playSound(Resource *res, int priority); public: Common::Array _soundTable; - bool _playingSound; - bool _isVoice; public: SoundManager(AccessEngine *vm, Audio::Mixer *mixer); ~SoundManager(); -- cgit v1.2.3