diff options
author | Max Horn | 2009-05-19 11:23:13 +0000 |
---|---|---|
committer | Max Horn | 2009-05-19 11:23:13 +0000 |
commit | 42cd21840055d97315eac8b78f110010e5270d2d (patch) | |
tree | fafcf0eb8f3edd126c84f710382e43c42d746f5d /engines | |
parent | 2b32ba7cb375dd80a119f56f661811971c671ca3 (diff) | |
download | scummvm-rg350-42cd21840055d97315eac8b78f110010e5270d2d.tar.gz scummvm-rg350-42cd21840055d97315eac8b78f110010e5270d2d.tar.bz2 scummvm-rg350-42cd21840055d97315eac8b78f110010e5270d2d.zip |
Improved Common::Serializer in several ways:
* Added support versioned serialization
* Added a convenience API for handling 'magic IDs' transparently
* Exposed the err()/clearErr() methods of the underlying streams
* Added a basic unit test for versioned loading (more should be added, in particular for saving)
* Removed the syncString(char *, uint16) alias for syncBytes(byte *buf, uint32 size)
svn-id: r40723
Diffstat (limited to 'engines')
-rw-r--r-- | engines/cruise/saveload.cpp | 14 | ||||
-rw-r--r-- | engines/cruise/sound.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/cruise/saveload.cpp b/engines/cruise/saveload.cpp index dde51dd382..b9edb2decd 100644 --- a/engines/cruise/saveload.cpp +++ b/engines/cruise/saveload.cpp @@ -148,8 +148,8 @@ static void syncBasicInfo(Common::Serializer &s) { static void syncBackgroundTable(Common::Serializer &s) { // restore backgroundTable for (int i = 0; i < 8; i++) { - s.syncString(backgroundTable[i].name, 9); - s.syncString(backgroundTable[i].extention, 6); + s.syncBytes((byte *)backgroundTable[i].name, 9); + s.syncBytes((byte *)backgroundTable[i].extention, 6); } } @@ -189,7 +189,7 @@ static void syncFilesDatabase(Common::Serializer &s) { } s.syncAsSint16LE(fe.subData.index); - s.syncString(fe.subData.name, 13); + s.syncBytes((byte *)fe.subData.name, 13); s.syncAsByte(dummyVal); s.syncAsSint16LE(fe.subData.transparency); @@ -213,7 +213,7 @@ static void syncPreloadData(Common::Serializer &s) { for (int i = 0; i < 64; i++) { preloadStruct &pe = preloadData[i]; - s.syncString(pe.name, 15); + s.syncBytes((byte *)pe.name, 15); s.syncAsByte(dummyByte); s.syncAsUint32LE(pe.size); s.syncAsUint32LE(pe.sourceSize); @@ -231,7 +231,7 @@ static void syncOverlays1(Common::Serializer &s) { for (int i = 0; i < numOfLoadedOverlay; i++) { overlayStruct &oe = overlayTable[i]; - s.syncString(oe.overlayName, 13); + s.syncBytes((byte *)oe.overlayName, 13); s.syncAsByte(dummyByte); s.syncAsUint32LE(dummyLong); s.syncAsUint16LE(oe.alreadyLoaded); @@ -464,7 +464,7 @@ static void syncIncrust(Common::Serializer &s) { s.syncAsSint16LE(t->saveSize); s.syncAsSint16LE(t->savedX); s.syncAsSint16LE(t->savedY); - s.syncString(t->name, 13); + s.syncBytes((byte *)t->name, 13); s.syncAsByte(dummyByte); s.syncAsSint16LE(t->spriteId); s.syncAsUint16LE(dummyWord); @@ -597,7 +597,7 @@ static void DoSync(Common::Serializer &s) { syncPalette(s, newPal); syncPalette(s, workpal); - s.syncString(currentCtpName, 40); + s.syncBytes((byte *)currentCtpName, 40); syncBackgroundTable(s); syncPalScreen(s); diff --git a/engines/cruise/sound.cpp b/engines/cruise/sound.cpp index a68323cc43..114e37679a 100644 --- a/engines/cruise/sound.cpp +++ b/engines/cruise/sound.cpp @@ -70,7 +70,7 @@ void MusicPlayer::resume() { void MusicPlayer::doSync(Common::Serializer &s) { // synchronise current music name, if any, state, and position - s.syncString(_musicName, 33); + s.syncBytes((byte *)_musicName, 33); uint16 v = (uint16)songLoaded(); s.syncAsSint16LE(v); s.syncAsSint16LE(_songPlayed); |