diff options
| author | Max Horn | 2003-09-07 19:28:45 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-07 19:28:45 +0000 |
| commit | 1dbab0237f253f2427e8218b3c5a2c97fdfb3f62 (patch) | |
| tree | 8586e18d708106b7ebdbe50d2ace44633e967274 /scumm/saveload.cpp | |
| parent | 361c3b95d52babd23b78864e6679334ed1c9e316 (diff) | |
| download | scummvm-rg350-1dbab0237f253f2427e8218b3c5a2c97fdfb3f62.tar.gz scummvm-rg350-1dbab0237f253f2427e8218b3c5a2c97fdfb3f62.tar.bz2 scummvm-rg350-1dbab0237f253f2427e8218b3c5a2c97fdfb3f62.zip | |
cleanup/refactoring
svn-id: r10070
Diffstat (limited to 'scumm/saveload.cpp')
| -rw-r--r-- | scumm/saveload.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index 7cb699d4d0..5e06e851bd 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -117,7 +117,7 @@ bool Scumm::loadState(int slot, bool compat, SaveFileManager *mgr) { memcpy(_saveLoadName, hdr.name, sizeof(hdr.name)); if (_imuseDigital) { - _imuseDigital->stopAll(); + _imuseDigital->stopAllSounds(); } _sound->stopBundleMusic(); @@ -546,13 +546,6 @@ void Scumm::saveOrLoad(Serializer *s, uint32 savegameVersion) { if (!s->isSaving() && (_saveSound || !_saveLoadCompatible)) { _sound->stopAllSounds(); - if (_mixer) { - if (_imuseDigital) { - _imuseDigital->stopAll(); - } else { - _mixer->stopAll(); - } - } } // Because old savegames won't fill the entire gfxUsageBits[] array, @@ -667,8 +660,8 @@ void Scumm::saveOrLoad(Serializer *s, uint32 savegameVersion) { if (_imuse && (_saveSound || !_saveLoadCompatible)) { _imuse->save_or_load(s, this); - _imuse->set_master_volume (_sound->_sound_volume_master); - _imuse->set_music_volume (_sound->_sound_volume_music); + _imuse->setMasterVolume(_sound->_sound_volume_master); + _imuse->set_music_volume(_sound->_sound_volume_music); } } |