[Scummvm-cvs-logs] CVS: scummvm/scumm resource_v3.cpp,1.11,1.12 string.cpp,1.100,1.101

[Jonathan Gray]

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

Modified Files:
	resource_v3.cpp string.cpp 
Log Message:
make zak use correct charset

Index: resource_v3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v3.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- resource_v3.cpp	7 Apr 2003 22:47:38 -0000	1.11
+++ resource_v3.cpp	9 Apr 2003 08:06:55 -0000	1.12
@@ -184,8 +184,11 @@
 	File file;
 	char buf[20];
 
-	sprintf(buf, "%02d.LFL", 99 - no);
-//	sprintf(buf, "%02d.LFL", 98 + no);
+	if (_gameId == GID_ZAK256)
+		sprintf(buf, "%02d.LFL", 98 + no);
+	else
+		sprintf(buf, "%02d.LFL", 99 - no);
+	
 	file.open(buf, _gameDataPath);
 		
 	if (file.isOpen() == false) {

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- string.cpp	8 Apr 2003 22:22:55 -0000	1.100
+++ string.cpp	9 Apr 2003 08:06:55 -0000	1.101
@@ -749,10 +749,9 @@
 void Scumm::initCharset(int charsetno) {
 	int i;
 
-	if (_gameId == GID_ZAK256) {
-		debug(0, "initCharset: FIXME using incorrect charset");
+	// FIXME why is this required? see also Scumm_v3::loadCharset
+	if (_gameId == GID_ZAK256)
 		charsetno = !charsetno;
-	}
 
 	if (_features & GF_SMALL_HEADER)
 		loadCharset(charsetno);