[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.18,1.19 scummvm.cpp,1.54,1.55

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv7794/scumm

Modified Files:
	resource.cpp scummvm.cpp 
Log Message:
Patch 623391: Verb shadow fix (MI2)


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- resource.cpp	11 Oct 2002 08:35:12 -0000	1.18
+++ resource.cpp	15 Oct 2002 10:59:53 -0000	1.19
@@ -450,8 +450,6 @@
 	if (_gameId == GID_INDY4 && no == 0)
 		no = 1;
 
-	memset(_charsetData, 0, sizeof(_charsetData));
-
 	assert(no < (int)sizeof(_charsetData) / 16);
 	checkRange(_maxCharsets - 1, 1, no, "Loading illegal charset %d");
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- scummvm.cpp	11 Oct 2002 08:35:12 -0000	1.54
+++ scummvm.cpp	15 Oct 2002 10:59:53 -0000	1.55
@@ -206,6 +206,8 @@
 	else
 		_resourceHeaderSize = 8;
 
+	memset(_charsetData, 0, sizeof(_charsetData));
+	
 	if (!(_features & GF_SMALL_NAMES))
 		loadCharset(1);