[Scummvm-cvs-logs] CVS: scummvm/scumm nut_renderer.cpp,1.18,1.19

Max Horn fingolfin at users.sourceforge.net
Mon Mar 3 18:46:16 CET 2003


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

Modified Files:
	nut_renderer.cpp 
Log Message:
load NUT fonts even if they do not specify full 256 chars (e.g. the COMI demo only defines 233 chars

Index: nut_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/nut_renderer.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- nut_renderer.cpp	3 Mar 2003 23:57:10 -0000	1.18
+++ nut_renderer.cpp	4 Mar 2003 02:45:50 -0000	1.19
@@ -105,25 +105,20 @@
 	
 	int32 l;
 	uint32 offset = READ_BE_UINT32(_dataSrc + 4) + 8;
+	memset(_offsets, 0, 256 * sizeof(int32));
 	for (l = 0; l < 256; l++) {
 		if (READ_BE_UINT32(_dataSrc + offset) == 'FRME') {
 			offset += 8;
 			if (READ_BE_UINT32(_dataSrc + offset) == 'FOBJ') {
 				_offsets[l] = offset + 8;
 				offset += READ_BE_UINT32(_dataSrc + offset + 4) + 8;
+			} else {
+				debug(2, "NutRenderer::loadFont(%s, %s) there is no FOBJ chunk in FRME chunk %d (offset %x)", filename, dir, l, offset);
+				break;
 			}
-			else {
-				debug(2, "NutRenderer::loadFont() there is no FRME chunk");
-				free(_dataSrc);
-				_dataSrc = NULL;
-				return false;
-			}
-		}
-		else {
-			debug(2, "NutRenderer::loadFont() there is no FOBJ chunk in FRME chunk");
-			free(_dataSrc);
-			_dataSrc = NULL;
-			return false;
+		} else {
+			debug(2, "NutRenderer::loadFont(%s, %s) there is no FRME chunk %d (offset %x)", filename, dir, l, offset);
+			break;
 		}
 	}
 





More information about the Scummvm-git-logs mailing list