diff options
| author | Max Horn | 2004-12-25 23:43:05 +0000 |
|---|---|---|
| committer | Max Horn | 2004-12-25 23:43:05 +0000 |
| commit | 81b6e9e1e6119c85e8b21739fea3580183154e5d (patch) | |
| tree | 90ff4fbc56afcee2ed328c3371511083f2710107 /saga | |
| parent | 65ca0a07289216d7183f86b8d3b76f0033c8d34e (diff) | |
| download | scummvm-rg350-81b6e9e1e6119c85e8b21739fea3580183154e5d.tar.gz scummvm-rg350-81b6e9e1e6119c85e8b21739fea3580183154e5d.tar.bz2 scummvm-rg350-81b6e9e1e6119c85e8b21739fea3580183154e5d.zip | |
Get rid of the useless & troublesome master_volume
svn-id: r16328
Diffstat (limited to 'saga')
| -rw-r--r-- | saga/music.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/saga/music.cpp b/saga/music.cpp index 79fb33f89b..338bf09977 100644 --- a/saga/music.cpp +++ b/saga/music.cpp @@ -518,7 +518,7 @@ int Music::play(uint32 music_rn, uint16 flags) { 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 |