aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/savegame.cpp
diff options
context:
space:
mode:
authorMax Horn2009-10-08 21:29:45 +0000
committerMax Horn2009-10-08 21:29:45 +0000
commit76996301d1988f2c6b2659e11223c3016c1232bc (patch)
treebb8534820be12d08e71e153a855a979d47a1c2ee /engines/sci/engine/savegame.cpp
parent3399c3aeb638ae874557c72b4ab4db016ff152c8 (diff)
downloadscummvm-rg350-76996301d1988f2c6b2659e11223c3016c1232bc.tar.gz
scummvm-rg350-76996301d1988f2c6b2659e11223c3016c1232bc.tar.bz2
scummvm-rg350-76996301d1988f2c6b2659e11223c3016c1232bc.zip
SCI: Removed obsolete stringfrags code
svn-id: r44803
Diffstat (limited to 'engines/sci/engine/savegame.cpp')
-rw-r--r--engines/sci/engine/savegame.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 0779085612..18e20d9c98 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -211,10 +211,14 @@ void SegManager::saveLoadWithSerializer(Common::Serializer &s) {
SegmentType type = (s.isSaving() && mobj) ? mobj->getType() : SEG_TYPE_INVALID;
s.syncAsUint32LE(type);
+ // Handle the OBSOLETE type SEG_TYPE_STRING_FRAG -- just ignore it
+ if (s.isLoading() && type == SEG_TYPE_STRING_FRAG) {
+ continue;
+ }
+
// If we were saving and mobj == 0, or if we are loading and this is an
// entry marked as empty -> skip to next
if (type == SEG_TYPE_INVALID) {
- mobj = 0;
continue;
}
@@ -461,10 +465,6 @@ void DataStack::saveLoadWithSerializer(Common::Serializer &s) {
}
}
-void StringFrag::saveLoadWithSerializer(Common::Serializer &s) {
- // TODO
-}
-
#pragma mark -
static void sync_songlib_t(Common::Serializer &s, SongLibrary &obj) {
@@ -697,8 +697,6 @@ static void reconstruct_sounds(EngineState *s) {
}
}
-void internal_stringfrag_strncpy(EngineState *s, reg_t *dest, reg_t *src, int len);
-
EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
EngineState *retval;
SongLibrary temp;