[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.44,1.45

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv26589

Modified Files:
	saveload.cpp 
Log Message:
fix saveload bug introduced 2 days ago

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- saveload.cpp	14 Jan 2003 10:05:40 -0000	1.44
+++ saveload.cpp	14 Jan 2003 18:20:56 -0000	1.45
@@ -575,6 +575,14 @@
 		s->saveLoadArrayOf(vm.slot, NUM_SCRIPT_SLOT, sizeof(vm.slot[0]), scriptSlotEntries);
 
 	s->saveLoadArrayOf(_objs, _numLocalObjects, sizeof(_objs[0]), objectEntries);
+	if (!s->isSaving() && savegameVersion < VER_V13) {
+		// Since roughly v13 of the save games, the objs storage has changed a bit
+		for (i = _numObjectsInRoom; i < _numLocalObjects; i++) {
+			if (_objs[i].fl_object_index == 0)
+				_objs[i].obj_nr = 0;
+		}
+
+	}
 	s->saveLoadArrayOf(_verbs, _numVerbs, sizeof(_verbs[0]), verbEntries);
 	s->saveLoadArrayOf(vm.nest, 16, sizeof(vm.nest[0]), nestedScriptEntries);
 	s->saveLoadArrayOf(_sentence, 6, sizeof(_sentence[0]), sentenceTabEntries);