ACCESS: Remove two useless variables

scummvm · Dec 27, 2014 · 3c3ff0a3aab13b876e0425c365402ff334743282 · 3c3ff0a
1 parent 6fe9bdf
commit 3c3ff0a3aab13b876e0425c365402ff334743282
Unified Split

Showing with 1 addition and 5 deletions.

+1 −1 engines/access/scripts.cpp

+0 −2 engines/access/sound.cpp

+0 −2 engines/access/sound.h
diff --git 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
@@ -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
@@ -56,8 +56,6 @@ class SoundManager {
 	void playSound(Resource *res, int priority);
 public:
 	Common::Array<SoundEntry> _soundTable;
-	bool _playingSound;
-	bool _isVoice;
 public:
 	SoundManager(AccessEngine *vm, Audio::Mixer *mixer);
 	~SoundManager();