[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.167,1.168

Max Horn fingolfin at users.sourceforge.net
Sun Dec 26 16:29:01 CET 2004


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17934/sky

Modified Files:
	sky.cpp 
Log Message:
Added 'sound types' to the mixer - for now, only plain (for the premixer), SFX and music; volume is now controlled based on the sound type

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- sky.cpp	20 Dec 2004 16:48:49 -0000	1.167
+++ sky.cpp	27 Dec 2004 00:26:58 -0000	1.168
@@ -239,8 +239,8 @@
 	if (!_mixer->isReady())
 		warning("Sound initialisation failed");
 
-	 _mixer->setVolume(ConfMan.getInt("sfx_volume"));
-	 _mixer->setMusicVolume(ConfMan.getInt("music_volume"));
+	 _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, ConfMan.getInt("sfx_volume"));
+	 _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume"));
 	_floppyIntro = ConfMan.getBool("alt_intro");
 
 	_skyDisk = new Disk(_gameDataPath);





More information about the Scummvm-git-logs mailing list