[Scummvm-cvs-logs] SF.net SVN: scummvm: [26149] scummvm/trunk/engines/queen

[cyx at users.sourceforge.net]

Revision: 26149
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26149&view=rev
Author:   cyx
Date:     2007-03-16 15:28:25 -0700 (Fri, 16 Mar 2007)

Log Message:
-----------
fixed volume slidebar display in journal, removed unused var

Modified Paths:
--------------
    scummvm/trunk/engines/queen/sound.cpp
    scummvm/trunk/engines/queen/sound.h

Modified: scummvm/trunk/engines/queen/sound.cpp
===================================================================
--- scummvm/trunk/engines/queen/sound.cpp	2007-03-16 20:47:58 UTC (rev 26148)
+++ scummvm/trunk/engines/queen/sound.cpp	2007-03-16 22:28:25 UTC (rev 26149)
@@ -220,13 +220,10 @@
 }
 
 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);

Modified: scummvm/trunk/engines/queen/sound.h
===================================================================
--- scummvm/trunk/engines/queen/sound.h	2007-03-16 20:47:58 UTC (rev 26148)
+++ scummvm/trunk/engines/queen/sound.h	2007-03-16 22:28:25 UTC (rev 26149)
@@ -147,7 +147,6 @@
 	bool isSfxActive() const 	{ return _mixer->isSoundHandleActive(_sfxHandle); }
 
 	void setVolume(int vol);
-	int volume();
 
 protected:
 	void waitFinished(bool isSpeech);
@@ -185,7 +184,6 @@
 	int _fanfareCount, _fluteCount;
 	Audio::SoundHandle _modHandle;
 	Audio::SoundHandle _sfxHandle;
-	Common::RandomSource _rnd;
 };
 
 } // End of namespace Queen


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.