aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine
diff options
context:
space:
mode:
authorFilippos Karapetis2009-12-31 08:30:30 +0000
committerFilippos Karapetis2009-12-31 08:30:30 +0000
commit54245f712d18860c1454d4d1b3878bad77d43728 (patch)
tree0062c85f0304761e3a2feefa2dc59858ab92883e /engines/sci/engine
parent762bdc7caded769c6440bae0e17fca8c37f5d317 (diff)
downloadscummvm-rg350-54245f712d18860c1454d4d1b3878bad77d43728.tar.gz
scummvm-rg350-54245f712d18860c1454d4d1b3878bad77d43728.tar.bz2
scummvm-rg350-54245f712d18860c1454d4d1b3878bad77d43728.zip
SCI/new music code: The loop selector for each music score is no longer cached, but read directly from the sound object
svn-id: r46792
Diffstat (limited to 'engines/sci/engine')
-rw-r--r--engines/sci/engine/savegame.cpp4
-rw-r--r--engines/sci/engine/savegame.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 7169e363e1..1c3ae06cec 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -116,7 +116,7 @@ void MusicEntry::saveLoadWithSerializer(Common::Serializer &s) {
uint32 restoreTime = 0;
s.syncAsSint32LE(restoreTime);
ticker = restoreTime * 60 / 1000;
- s.syncAsSint32LE(loop);
+ s.skip(4); // loop
s.skip(4); // hold
// volume and dataInc will be synced from the sound objects
// when the sound list is reconstructed in gamestate_restore()
@@ -134,7 +134,7 @@ void MusicEntry::saveLoadWithSerializer(Common::Serializer &s) {
s.syncAsSint16LE(dataInc);
s.syncAsSint16LE(ticker);
s.syncAsByte(prio);
- s.syncAsByte(loop);
+ s.skip(1, VER(15), VER(15));
s.syncAsByte(volume);
s.syncAsByte(fadeTo);
s.syncAsSint16LE(fadeStep);
diff --git a/engines/sci/engine/savegame.h b/engines/sci/engine/savegame.h
index 6f16546dfa..ae3badc6da 100644
--- a/engines/sci/engine/savegame.h
+++ b/engines/sci/engine/savegame.h
@@ -36,7 +36,7 @@ namespace Sci {
struct EngineState;
enum {
- CURRENT_SAVEGAME_VERSION = 15,
+ CURRENT_SAVEGAME_VERSION = 16,
MINIMUM_SAVEGAME_VERSION = 9
};