diff options
| author | Willem Jan Palenstijn | 2013-09-21 20:05:47 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-09-21 20:05:47 +0200 |
| commit | 4b5ca10f68effb88e297d72f6ea366d760acf9ed (patch) | |
| tree | 4a410f6c32f452afaef54c43119730cf6b53c60b /engines/sci/engine | |
| parent | a6d902df2827b91dc641b6f51c0a070b70a09179 (diff) | |
| parent | 97b255ab33fa5fcd4507573e77cd42a8406e1b55 (diff) | |
| download | scummvm-rg350-4b5ca10f68effb88e297d72f6ea366d760acf9ed.tar.gz scummvm-rg350-4b5ca10f68effb88e297d72f6ea366d760acf9ed.tar.bz2 scummvm-rg350-4b5ca10f68effb88e297d72f6ea366d760acf9ed.zip | |
Merge branch 'master' into sci_midiparser
Conflicts:
engines/sci/sound/midiparser_sci.cpp
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/savegame.cpp | 5 | ||||
| -rw-r--r-- | engines/sci/engine/savegame.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index c8076ec819..c60b50a964 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -600,7 +600,10 @@ void MusicEntry::saveLoadWithSerializer(Common::Serializer &s) { s.syncAsSint16LE(dataInc); s.syncAsSint16LE(ticker); s.syncAsSint16LE(signal, VER(17)); - s.syncAsByte(priority); + if (s.getVersion() >= 31) // FE sound/music.h -> priority + s.syncAsSint16LE(priority); + else + s.syncAsByte(priority); s.syncAsSint16LE(loop, VER(17)); s.syncAsByte(volume); s.syncAsByte(hold, VER(17)); diff --git a/engines/sci/engine/savegame.h b/engines/sci/engine/savegame.h index 1d899b0d37..f1f02f89f2 100644 --- a/engines/sci/engine/savegame.h +++ b/engines/sci/engine/savegame.h @@ -37,6 +37,7 @@ struct EngineState; * * Version - new/changed feature * ============================= + * 31 - priority for sound effects/music is now a signed int16, instead of a byte * 30 - synonyms * 29 - system strings * 28 - heap @@ -55,7 +56,7 @@ struct EngineState; */ enum { - CURRENT_SAVEGAME_VERSION = 30, + CURRENT_SAVEGAME_VERSION = 31, MINIMUM_SAVEGAME_VERSION = 14 }; |