[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.202,1.203 saveload.cpp,1.153,1.154

[Torbj?rn Andersson]

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

Modified Files:
	resource.cpp saveload.cpp 
Log Message:
Added note that the previous commit probably fixed bug #933610 as well.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- resource.cpp	20 Apr 2004 07:10:11 -0000	1.202
+++ resource.cpp	20 Apr 2004 07:21:24 -0000	1.203
@@ -2111,7 +2111,8 @@
 		_numLocalObjects = _fileHandle.readUint16LE();   // 200
 		_numArray = 50;
 		_numVerbs = 100;
-		// Used to be 50, which wasn't enough for MI2. See bug #936323.
+		// Used to be 50, which wasn't enough for MI2 and FOA. See bugs
+		// #933610 and #936323.
 		_numNewNames = 100;
 		_objectRoomTable = NULL;
 

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- saveload.cpp	20 Apr 2004 07:10:13 -0000	1.153
+++ saveload.cpp	20 Apr 2004 07:21:25 -0000	1.154
@@ -824,10 +824,11 @@
 				}
 				if (type == rtObjectName && ser->getVersion() >= VER(25)) {
 					// Paranoia: We increased the possible number of new names
-					// for MI2 to fix bug #936323. The savegame format didn't
-					// change, but at least during the transition period there
-					// is a slight chance that we try to load more names than
-					// we have allocated space for. If so, discard them.
+					// to fix bugs #933610 and #936323. The savegame format
+					// didn't change, but at least during the transition
+					// period there is a slight chance that we try to load
+					// more names than we have allocated space for. If so,
+					// discard them.
 					if (idx < _numNewNames)
 						_newNames[idx] = ser->loadUint16();
 				}