[Scummvm-cvs-logs] scummvm master -> 3c3ff0a3aab13b876e0425c365402ff334743282

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3c3ff0a3aa ACCESS: Remove two useless variables


Commit: 3c3ff0a3aab13b876e0425c365402ff334743282
    https://github.com/scummvm/scummvm/commit/3c3ff0a3aab13b876e0425c365402ff334743282
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-12-27T16:46:33+01:00

Commit Message:
ACCESS: Remove two useless variables

Changed paths:
    engines/access/scripts.cpp
    engines/access/sound.cpp
    engines/access/sound.h



diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 074c781..1bd2489 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 cfc8b7a..fc574dc 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 3646c2c..384e9ac 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();