[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.300,1.301

Max Horn fingolfin at users.sourceforge.net
Sun Apr 3 16:11:02 CEST 2005


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

Modified Files:
	resource.cpp 
Log Message:
loadCharset gets overloaded for small header games, so no need to check for those in here

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -r1.300 -r1.301
--- resource.cpp	3 Apr 2005 22:55:50 -0000	1.300
+++ resource.cpp	3 Apr 2005 23:10:17 -0000	1.301
@@ -584,10 +584,7 @@
 	assert(no < (int)sizeof(_charsetData) / 16);
 	checkRange(_numCharsets - 1, 1, no, "Loading illegal charset %d");
 
-//  ensureResourceLoaded(rtCharset, no);
 	ptr = getResourceAddress(rtCharset, no);
-	if (_features & GF_SMALL_HEADER)
-		ptr -= 12;
 
 	for (i = 0; i < 15; i++) {
 		_charsetData[no][i + 1] = ptr[i + 14];





More information about the Scummvm-git-logs mailing list