diff options
author | Jordi Vilalta Prat | 2008-05-06 03:00:26 +0000 |
---|---|---|
committer | Jordi Vilalta Prat | 2008-05-06 03:00:26 +0000 |
commit | 38a8aa516e0fa315e318801e5399f82e51efa8df (patch) | |
tree | c6f7bc89fe2340a846ef891cefc9031cfdb32ec9 /engines/scumm/saveload.cpp | |
parent | 3ac46924e311afb6b02615af04556da823c4f3f3 (diff) | |
download | scummvm-rg350-38a8aa516e0fa315e318801e5399f82e51efa8df.tar.gz scummvm-rg350-38a8aa516e0fa315e318801e5399f82e51efa8df.tar.bz2 scummvm-rg350-38a8aa516e0fa315e318801e5399f82e51efa8df.zip |
Allow static and dynamic plugins to be used at the same time
svn-id: r31888
Diffstat (limited to 'engines/scumm/saveload.cpp')
-rw-r--r-- | engines/scumm/saveload.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 8d23e47bbf..a8ef26c484 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -235,7 +235,7 @@ bool ScummEngine::loadState(int slot, bool compat) { if (!_imuse || _saveSound || !_saveTemporaryState) _sound->stopAllSounds(); -#ifndef DISABLE_SCUMM_7_8 +#ifdef ENABLE_SCUMM_7_8 if (_imuseDigital) { _imuseDigital->stopAllSounds(); _imuseDigital->resetState(); @@ -1239,7 +1239,7 @@ void ScummEngine_v5::saveOrLoad(Serializer *s) { s->saveLoadEntries(this, cursorEntries); } -#ifndef DISABLE_SCUMM_7_8 +#ifdef ENABLE_SCUMM_7_8 void ScummEngine_v7::saveOrLoad(Serializer *s) { ScummEngine::saveOrLoad(s); @@ -1292,7 +1292,7 @@ void ScummEngine_v70he::saveOrLoad(Serializer *s) { s->saveLoadEntries(this, HE70Entries); } -#ifndef DISABLE_HE +#ifdef ENABLE_HE void ScummEngine_v71he::saveOrLoad(Serializer *s) { ScummEngine_v70he::saveOrLoad(s); |