diff options
| author | Filippos Karapetis | 2008-09-05 13:02:03 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-09-05 13:02:03 +0000 |
| commit | 6d4900ad06821c69334735b48f8451e32030bcad (patch) | |
| tree | 8027fe3c96bc6ea7e58812a36bdc35421ea12afd /engines/saga/music.cpp | |
| parent | 531ff7b33c657a10a1fd81219a5a893510ca07ae (diff) | |
| download | scummvm-rg350-6d4900ad06821c69334735b48f8451e32030bcad.tar.gz scummvm-rg350-6d4900ad06821c69334735b48f8451e32030bcad.tar.bz2 scummvm-rg350-6d4900ad06821c69334735b48f8451e32030bcad.zip | |
Hopefully fixed the chaos with the SAGA volume values. This also fixes the broken volume introduced with the introduction of the RTL code in the engine
svn-id: r34349
Diffstat (limited to 'engines/saga/music.cpp')
| -rw-r--r-- | engines/saga/music.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index 9b0efad0d5..5bf0c0ec03 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -404,7 +404,7 @@ void Music::musicVolumeGauge() { } void Music::setVolume(int volume, int time) { - _targetVolume = volume * 2; // ScummVM has different volume scale + _targetVolume = volume; _currentVolumePercent = 0; if (volume == -1) // Set Full volume @@ -585,7 +585,7 @@ void Music::play(uint32 resourceId, MusicFlags flags) { parser->property(MidiParser::mpCenterPitchWheelOnUnload, 1); _player->_parser = parser; - setVolume(_vm->_musicVolume == 10 ? 255 : _vm->_musicVolume * 25); + setVolume(_vm->_musicVolume); if (flags & MUSIC_LOOP) _player->setLoop(true); @@ -603,7 +603,7 @@ void Music::pause(void) { } void Music::resume(void) { - _player->setVolume(_vm->_musicVolume == 10 ? 255 : _vm->_musicVolume * 25); + _player->setVolume(_vm->_musicVolume); _player->setPlaying(true); } |