aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2015-05-18 18:21:41 -0400
committerPaul Gilbert2015-05-18 18:21:41 -0400
commitc24d0de8f6147ef31e015a3e642fcb1896013b50 (patch)
treefeb4d14e80f57662a061962395eca3c7a9215eab
parent0b50a077f7ef1308f3da8a0e6ac29e5bdff78c99 (diff)
downloadscummvm-rg350-c24d0de8f6147ef31e015a3e642fcb1896013b50.tar.gz
scummvm-rg350-c24d0de8f6147ef31e015a3e642fcb1896013b50.tar.bz2
scummvm-rg350-c24d0de8f6147ef31e015a3e642fcb1896013b50.zip
SHERLOCK: Remove unused variable
-rw-r--r--engines/sherlock/animation.cpp2
-rw-r--r--engines/sherlock/sound.cpp1
-rw-r--r--engines/sherlock/sound.h1
3 files changed, 0 insertions, 4 deletions
diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 6cdefaffbd..3c7b2b7443 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -40,7 +40,6 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
Screen &screen = *_vm->_screen;
Sound &sound = *_vm->_sound;
int soundNumber = 0;
- sound._playingEpilogue = true;
// Check for any any sound frames for the given animation
const int *soundFrames = checkForSoundFrames(filename);
@@ -133,7 +132,6 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
events.clearEvents();
sound.stopSound();
delete stream;
- sound._playingEpilogue = false;
return !skipped && !_vm->shouldQuit();
}
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 3270fbf7e4..b44eb17397 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -34,7 +34,6 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
_digitized = false;
_music = false;
_voices = 0;
- _playingEpilogue = false;
_diskSoundPlaying = false;
_soundPlaying = false;
_soundIsOn = &_soundPlaying;
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 4d94c58f6f..62d4aa24c4 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -54,7 +54,6 @@ public:
bool _soundOn;
bool _musicOn;
bool _speechOn;
- bool _playingEpilogue;
bool _diskSoundPlaying;
bool _soundPlaying;
bool *_soundIsOn;