From 00e85d9f5705745cd9ce0fd70bc8a1ff11bb7fa1 Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Fri, 16 Mar 2007 22:28:25 +0000
Subject: fixed volume slidebar display in journal, removed unused var

svn-id: r26149
---
 engines/queen/sound.cpp | 5 +----
 engines/queen/sound.h   | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'engines')

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
-- 
cgit v1.2.3