diff options
| -rw-r--r-- | scumm/saveload.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index c0bb7e7f4f..d84366fff9 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -73,14 +73,6 @@ bool Scumm::saveState(int slot, bool compat, SaveFileManager *mgr) { Serializer ser(out, true, CURRENT_VER); saveOrLoad(&ser, CURRENT_VER); -#ifdef __PALM_OS__ - if (_imuse && _saveSound) { // moved here to prevent stack overflow on palmos - _imuse->save_or_load(&ser, this); - _imuse->set_master_volume (_sound->_sound_volume_master); - _imuse->set_music_volume (_sound->_sound_volume_music); - } -#endif - delete out; debug(1, "State saved as '%s'", filename); return true; @@ -149,13 +141,6 @@ bool Scumm::loadState(int slot, bool compat, SaveFileManager *mgr) { Serializer ser(out, false, hdr.ver); saveOrLoad(&ser, hdr.ver); -#ifdef __PALM_OS__ - if (_imuse && _saveSound) { // moved here to prevent stack overflow on palmos - _imuse->save_or_load(&ser, this); - _imuse->set_master_volume (_sound->_sound_volume_master); - _imuse->set_music_volume (_sound->_sound_volume_music); - } -#endif delete out; sb = _screenB; @@ -629,13 +614,11 @@ void Scumm::saveOrLoad(Serializer *s, uint32 savegameVersion) { } } -#ifndef __PALM_OS__// moved to ::loadState/saveState to prevent stack overflow on palmos if (_imuse && _saveSound) { _imuse->save_or_load(s, this); _imuse->set_master_volume (_sound->_sound_volume_master); _imuse->set_music_volume (_sound->_sound_volume_music); } -#endif } void Scumm::saveLoadResource(Serializer *ser, int type, int idx) { |