[Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.41,1.42

[Max Horn]

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

Modified Files:
	music.cpp 
Log Message:
Get rid of the useless & troublesome master_volume

Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- music.cpp	22 Dec 2004 19:34:41 -0000	1.41
+++ music.cpp	25 Dec 2004 23:43:05 -0000	1.42
@@ -518,7 +518,7 @@
 	parser->setTimerRate(_player->getBaseTempo());
 
 	_player->_parser = parser;
-	_player->setVolume(ConfMan.getInt("music_volume") * ConfMan.getInt("master_volume") / 255);
+	_player->setVolume(ConfMan.getInt("music_volume"));
 	if (flags & MUSIC_LOOP)
 		_player->setLoop(true);
 	else