[Scummvm-cvs-logs] CVS: scummvm/scumm nut_renderer.cpp,1.45,1.46

Pawel Kolodziejski aquadran at users.sourceforge.net
Mon Apr 5 11:59:04 CEST 2004


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

Modified Files:
	nut_renderer.cpp 
Log Message:
removed exception for no used nut font

Index: nut_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/nut_renderer.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- nut_renderer.cpp	4 Apr 2004 19:50:52 -0000	1.45
+++ nut_renderer.cpp	5 Apr 2004 18:45:40 -0000	1.46
@@ -149,23 +149,8 @@
 
 	for (int l = 0; l < _nbChars; l++) {
 		offset += READ_BE_UINT32(dataSrc + offset + 4) + 8;
-		
-		// TODO/FIXME: The code checks for a "shift" in the FRME headers. Well, neither
-		// in my german nor in my english NUT fonts does that occur, but it's very typical
-		// for IFF style formats (like this here) to "pad" odd sized blocks. Hence, it might
-		// be a cleaner solution to insert this adjustment here:
-		//   if (offset & 1)
-		//       offset++;
-		// And then get rid of the hack for the shifted FRME. I'd do that right now, but since
-		// I have no way to test this (read: no data files where this issue occurs), I am
-		// deferring this job for now :-)
-
-		if ((READ_BE_UINT32(dataSrc + offset) == 'FRME') || (READ_BE_UINT32(dataSrc + offset + 1) == 'FRME')) {
-			if (READ_BE_UINT32(dataSrc + offset) == 'FRME') {
-				offset += 8;
-			} else { // hack for proper offset
-				offset += 9;
-			}
+		if (READ_BE_UINT32(dataSrc + offset) == 'FRME') {
+			offset += 8;
 
 			if (READ_BE_UINT32(dataSrc + offset) == 'FOBJ') {
 				int codec = READ_LE_UINT16(dataSrc + offset + 8);





More information about the Scummvm-git-logs mailing list