[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.17,1.18

Eugene Sandulenko sev at users.sourceforge.net
Sun Nov 28 16:26:21 CET 2004


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

Modified Files:
	kyra.cpp 
Log Message:
Fix music volume


Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- kyra.cpp	28 Nov 2004 23:15:46 -0000	1.17
+++ kyra.cpp	29 Nov 2004 00:25:14 -0000	1.18
@@ -103,7 +103,8 @@
 		warning("Sound initialization failed.");
 	}
 
-	_mixer->setVolume(ConfMan.getInt("sfx_volume") * ConfMan.getInt("master_volume") / 255);
+	_mixer->setVolume(ConfMan.getInt("sfx_volume"));
+	_mixer->setMusicVolume(ConfMan.getInt("music_volume"));
 
 	// gets the game
 	if (detector->_game.features & GF_KYRA1) {





More information about the Scummvm-git-logs mailing list