[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.210,1.211

Max Horn fingolfin at users.sourceforge.net
Tue Apr 26 09:02:39 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6921

Modified Files:
	saveload.cpp 
Log Message:
Comment corrections

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- saveload.cpp	26 Apr 2005 13:43:01 -0000	1.210
+++ saveload.cpp	26 Apr 2005 13:47:47 -0000	1.211
@@ -742,7 +742,7 @@
 	}
 
 	//
-	// Load actors
+	// Save/load actors
 	//
 	if (s->isLoading()) {
 		// Not all actor data is saved; so when loading, we first reset
@@ -754,10 +754,13 @@
 	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 @@
 	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 @@
  			}
 	}
 
+	//
+	// 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 @@
 
 	s->saveLoadArrayOf(_classData, _numGlobalObjects, sizeof(_classData[0]), sleUint32);
 
+
+	//
+	// Save/load script variables
+	//
 	var120Backup = _scummVars[120];
 	var98Backup = _scummVars[98];
 
@@ -889,7 +901,9 @@
 
 	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 @@
 		}
 	}
 
-	// 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 @@
 			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);
 	}





More information about the Scummvm-git-logs mailing list