[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.15,2.16 resource_v3.cpp,1.9,1.10 scummvm.cpp,2.69,2.70

[Pawel Kolodziejski]

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

Modified Files:
	charset.cpp resource_v3.cpp scummvm.cpp 
Log Message:
zak256 invertory bug is not repeatable, changed order font selection, added handle font support for all V3 scumm games

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -d -r2.15 -r2.16
--- charset.cpp	6 Mar 2003 21:45:53 -0000	2.15
+++ charset.cpp	7 Apr 2003 06:34:41 -0000	2.16
@@ -61,9 +61,9 @@
 	// FIXME - this fixes the inventory icons in Zak256/Indy3
 	//  see bug #613109.
 	// chars 1,2: up arrow chars 3,4: down arrow
-	if ((_vm->_gameId == GID_ZAK256 || _vm->_gameId == GID_INDY3_256)
-			&& (chr >= 1 && chr <= 4))
-		spacing = 6;
+//	if ((_vm->_gameId == GID_ZAK256 || _vm->_gameId == GID_INDY3_256)
+//			&& (chr >= 1 && chr <= 4))
+//		spacing = 6;
 
 	return spacing;
 }

Index: resource_v3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v3.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- resource_v3.cpp	6 Apr 2003 21:24:39 -0000	1.9
+++ resource_v3.cpp	7 Apr 2003 06:34:42 -0000	1.10
@@ -181,12 +181,21 @@
 	checkRange(4, 0, no, "Loading illegal charset %d");
 	closeRoom();
 
-	openRoom(98 + no);
-
-	size = _fileHandle.readUint16LE();
+	File file;
+	char buf[20];
 
-	_fileHandle.read(createResource(6, no, size), size);
-	closeRoom();
+	sprintf(buf, "%02d.LFL", 99 - no);
+//	sprintf(buf, "%02d.LFL", 98 + no);
+	file.open(buf, _gameDataPath);
+		
+	if (file.isOpen() == false) {
+		error("loadCharset(%d): Missing file charset: %s", no, buf);
+	}
+		
+	size = file.readUint16LE();
+	file.read(createResource(rtCharset, no, size), size);
+		
+	file.close();
 }
 
 void Scumm_v3::readMAXS() {

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.69
retrieving revision 2.70
diff -u -d -r2.69 -r2.70
--- scummvm.cpp	7 Apr 2003 05:10:57 -0000	2.69
+++ scummvm.cpp	7 Apr 2003 06:34:42 -0000	2.70
@@ -314,7 +314,7 @@
 		initScreens(0, 16, _realWidth, 144);
 	}
 
-	if (_features & GF_OLD256)
+	if (_features & GF_AFTER_V3)
 		_charset = new CharsetRendererOld256(this);
 	else if (_features & GF_AFTER_V8)
 		_charset = new CharsetRendererNut(this);