diff options
| author | Max Horn | 2005-04-26 13:47:47 +0000 |
|---|---|---|
| committer | Max Horn | 2005-04-26 13:47:47 +0000 |
| commit | 9d07432375681bc99627a595ed4d259898a607e6 (patch) | |
| tree | 20c97fd5a165dd10aee8eaeed277d964253aa0da | |
| parent | 0ca7d3a61e713b09870f0b421a490beffd8105e0 (diff) | |
| download | scummvm-rg350-9d07432375681bc99627a595ed4d259898a607e6.tar.gz scummvm-rg350-9d07432375681bc99627a595ed4d259898a607e6.tar.bz2 scummvm-rg350-9d07432375681bc99627a595ed4d259898a607e6.zip | |
Comment corrections
svn-id: r17820
| -rw-r--r-- | scumm/saveload.cpp | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index 17996c822f..9254c8d3c6 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -742,7 +742,7 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) { } // - // Load actors + // Save/load actors // if (s->isLoading()) { // Not all actor data is saved; so when loading, we first reset @@ -754,10 +754,13 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) { s->saveLoadArrayOf(_actors, _numActors, sizeof(_actors[0]), actorEntries); // - // Load sound data + // Save/load sound data // s->saveLoadEntries(_sound, soundEntries); + // + // Save/load script data + // if (savegameVersion < VER(9)) s->saveLoadArrayOf(vm.slot, 25, sizeof(vm.slot[0]), scriptSlotEntries); else if (savegameVersion < VER(20)) @@ -799,7 +802,9 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) { if (savegameVersion >= VER(13)) s->saveLoadArrayOf(_scaleSlots, 20, sizeof(_scaleSlots[0]), scaleSlotsEntries); - // Save all resource. + // + // Save/load resources + // int type, idx; if (savegameVersion >= VER(26)) { // New, more robust resource save/load system. This stores the type @@ -844,6 +849,9 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) { } } + // + // Save/load object data + // s->saveLoadArrayOf(_objectOwnerTable, _numGlobalObjects, sizeof(_objectOwnerTable[0]), sleByte); s->saveLoadArrayOf(_objectStateTable, _numGlobalObjects, sizeof(_objectStateTable[0]), sleByte); if (_objectRoomTable) @@ -870,6 +878,10 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) { s->saveLoadArrayOf(_classData, _numGlobalObjects, sizeof(_classData[0]), sleUint32); + + // + // Save/load script variables + // var120Backup = _scummVars[120]; var98Backup = _scummVars[98]; @@ -889,7 +901,9 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) { s->saveLoadArrayOf(_bitVars, _numBitVariables >> 3, 1, sleByte); - /* Save or load a list of the locked objects */ + // + // Save/load a list of the locked objects + // if (s->isSaving()) { for (i = rtFirst; i <= rtLast; i++) for (j = 1; j < res.num[i]; j++) { @@ -906,7 +920,9 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) { } } - // Save/load Audio CD status + // + // Save/load the Audio CD status + // if (savegameVersion >= VER(24)) { AudioCDManager::Status info; if (s->isSaving()) @@ -919,6 +935,9 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) { AudioCD.play(info.track, info.numLoops, info.start, info.duration); } + // + // Save/load the iMuse status + // if (_imuse && (_saveSound || !_saveTemporaryState)) { _imuse->save_or_load(s, this); } |