diff options
| author | Gregory Montoir | 2007-03-16 22:28:25 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2007-03-16 22:28:25 +0000 |
| commit | 00e85d9f5705745cd9ce0fd70bc8a1ff11bb7fa1 (patch) | |
| tree | 0e812bf28a9117628072ea78f4d3e33b9d30beaf | |
| parent | a8d0bccdc0dc9720120045d441a4c9dafee701e5 (diff) | |
| download | scummvm-rg350-00e85d9f5705745cd9ce0fd70bc8a1ff11bb7fa1.tar.gz scummvm-rg350-00e85d9f5705745cd9ce0fd70bc8a1ff11bb7fa1.tar.bz2 scummvm-rg350-00e85d9f5705745cd9ce0fd70bc8a1ff11bb7fa1.zip | |
fixed volume slidebar display in journal, removed unused var
svn-id: r26149
| -rw-r--r-- | engines/queen/sound.cpp | 5 | ||||
| -rw-r--r-- | engines/queen/sound.h | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index e6d9e23e80..343e81efdb 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -220,13 +220,10 @@ void PCSound::playSpeech(const char *base) { } void PCSound::setVolume(int vol) { + Sound::setVolume(vol); _music->setVolume(vol); } -int PCSound::volume() { - return _music->getVolume(); -} - void PCSound::waitFinished(bool isSpeech) { while (_mixer->isSoundHandleActive(isSpeech ? _speechHandle : _sfxHandle)) _vm->input()->delay(10); diff --git a/engines/queen/sound.h b/engines/queen/sound.h index f004edc599..40092299a7 100644 --- a/engines/queen/sound.h +++ b/engines/queen/sound.h @@ -147,7 +147,6 @@ public: bool isSfxActive() const { return _mixer->isSoundHandleActive(_sfxHandle); } void setVolume(int vol); - int volume(); protected: void waitFinished(bool isSpeech); @@ -185,7 +184,6 @@ protected: int _fanfareCount, _fluteCount; Audio::SoundHandle _modHandle; Audio::SoundHandle _sfxHandle; - Common::RandomSource _rnd; }; } // End of namespace Queen |