aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/savegame.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sci/engine/savegame.cpp')
-rw-r--r--engines/sci/engine/savegame.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index e0f9ec34db..995d7319c9 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -435,10 +435,7 @@ void EngineState::saveLoadWithSerializer(Common::Serializer &s) {
g_sci->_gfxPalette32->saveLoadWithSerializer(s);
g_sci->_gfxRemap32->saveLoadWithSerializer(s);
g_sci->_gfxCursor32->saveLoadWithSerializer(s);
- // TODO: SCI2 should be using Audio32 too, but is not yet.
- if (g_sci->_audio32) {
- g_sci->_audio32->saveLoadWithSerializer(s);
- }
+ g_sci->_audio32->saveLoadWithSerializer(s);
g_sci->_video32->saveLoadWithSerializer(s);
} else
#endif
@@ -714,10 +711,10 @@ void SoundCommandParser::reconstructPlayList() {
initSoundResource(entry);
#ifdef ENABLE_SCI32
- if (_soundVersion >= SCI_VERSION_2_1_EARLY && entry->isSample) {
+ if (_soundVersion >= SCI_VERSION_2 && entry->isSample) {
const reg_t &soundObj = entry->soundObj;
- if ((int)readSelectorValue(_segMan, soundObj, SELECTOR(loop)) != -1 &&
+ if (readSelectorValue(_segMan, soundObj, SELECTOR(loop)) == 0xFFFF &&
readSelector(_segMan, soundObj, SELECTOR(handle)) != NULL_REG) {
writeSelector(_segMan, soundObj, SELECTOR(handle), NULL_REG);