[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.105,1.106 resource_v3.cpp,1.15,1.16

[Max Horn]

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

Modified Files:
	string.cpp resource_v3.cpp 
Log Message:
unified Zak256 charset code with the rest; this *might* cause a regression should anywhere in Zak256 a charset > 1 be set; if so, tell me where exactly, and I can try to figure out a proper fix

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- string.cpp	27 Apr 2003 18:49:27 -0000	1.105
+++ string.cpp	29 Apr 2003 10:26:35 -0000	1.106
@@ -753,13 +753,7 @@
 void Scumm::initCharset(int charsetno) {
 	int i;
 
-	// FIXME why is this required? see also Scumm_v3::loadCharset
-	if (_gameId == GID_ZAK256)
-		charsetno = !charsetno;
-
-	if (_features & GF_SMALL_HEADER)
-		loadCharset(charsetno);
-	else if (!getResourceAddress(rtCharset, charsetno))
+	if (!getResourceAddress(rtCharset, charsetno))
 		loadCharset(charsetno);
 
 	_string[0].t_charset = charsetno;

Index: resource_v3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v3.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- resource_v3.cpp	11 Apr 2003 20:05:37 -0000	1.15
+++ resource_v3.cpp	29 Apr 2003 10:26:35 -0000	1.16
@@ -164,16 +164,16 @@
 	uint32 size;
 	memset(_charsetData, 0, sizeof(_charsetData));
 
-	checkRange(4, 0, no, "Loading illegal charset %d");
+	if (_gameId == GID_ZAK256)
+		checkRange(2, 0, no, "Loading illegal charset %d");
+	else
+		checkRange(4, 0, no, "Loading illegal charset %d");
 	closeRoom();
 
 	File file;
 	char buf[20];
 
-	if (_gameId == GID_ZAK256)
-		sprintf(buf, "%02d.LFL", 98 + no);
-	else
-		sprintf(buf, "%02d.LFL", 99 - no);
+	sprintf(buf, "%02d.LFL", 99 - no);
 	
 	file.open(buf, _gameDataPath);