diff options
author | Strangerke | 2014-12-27 16:46:33 +0100 |
---|---|---|
committer | Strangerke | 2014-12-27 16:46:33 +0100 |
commit | 3c3ff0a3aab13b876e0425c365402ff334743282 (patch) | |
tree | 50b590f1f80b265dcad7c6cae8ecb587fabe8f58 | |
parent | 6fe9bdf6c6f63320e351c348970c2864af708c42 (diff) | |
download | scummvm-rg350-3c3ff0a3aab13b876e0425c365402ff334743282.tar.gz scummvm-rg350-3c3ff0a3aab13b876e0425c365402ff334743282.tar.bz2 scummvm-rg350-3c3ff0a3aab13b876e0425c365402ff334743282.zip |
ACCESS: Remove two useless variables
-rw-r--r-- | engines/access/scripts.cpp | 2 | ||||
-rw-r--r-- | engines/access/sound.cpp | 2 | ||||
-rw-r--r-- | engines/access/sound.h | 2 |
3 files changed, 1 insertions, 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<SoundEntry> _soundTable; - bool _playingSound; - bool _isVoice; public: SoundManager(AccessEngine *vm, Audio::Mixer *mixer); ~SoundManager(); |