[Scummvm-cvs-logs] CVS: scummvm/bs2 sword2.cpp,1.32,1.33

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Mon Sep 22 07:56:07 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv6990

Modified Files:
	sword2.cpp 
Log Message:
Set the mixer to use the maximum volume. BS2 has its own volume settings,
and we want them to go all the way up to eleven.


Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sword2.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- sword2.cpp	20 Sep 2003 18:33:24 -0000	1.32
+++ sword2.cpp	22 Sep 2003 14:55:17 -0000	1.33
@@ -109,8 +109,11 @@
 	if (!_mixer->bindToSystem(syst))
 		warning("Sound initialization failed");
 
-	_mixer->setVolume(kDefaultSFXVolume * kDefaultMasterVolume / 255);
-	_mixer->setMusicVolume(kDefaultMusicVolume * kDefaultMasterVolume / 255);
+	// 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);
 
 	g_sound = _sound = new Sword2Sound(_mixer);
 	





More information about the Scummvm-git-logs mailing list