[Scummvm-cvs-logs] CVS: scummvm/sword2 sword2.cpp,1.127,1.128

Max Horn fingolfin at users.sourceforge.net
Sun Dec 26 16:28:02 CET 2004


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

Modified Files:
	sword2.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: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- sword2.cpp	9 Dec 2004 15:06:49 -0000	1.127
+++ sword2.cpp	27 Dec 2004 00:27:00 -0000	1.128
@@ -255,8 +255,8 @@
 	// We have our own volume settings panel, so don't let ScummVM's mixer
 	// soften the sound in any way.
 
-	_mixer->setVolume(256);
-	_mixer->setMusicVolume(256);
+	_mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, 256);
+	_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, 256);
 
 	// During normal gameplay, we care neither about mouse button releases
 	// nor the scroll wheel.





More information about the Scummvm-git-logs mailing list