[Scummvm-cvs-logs] SF.net SVN: scummvm: [25224] scummvm/trunk/engines/scumm/nut_renderer.cpp

cyx at users.sourceforge.net cyx at users.sourceforge.net
Sat Jan 27 03:30:17 CET 2007


Revision: 25224
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25224&view=rev
Author:   cyx
Date:     2007-01-26 18:30:17 -0800 (Fri, 26 Jan 2007)

Log Message:
-----------
added missing MKID_BE macros

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/nut_renderer.cpp

Modified: scummvm/trunk/engines/scumm/nut_renderer.cpp
===================================================================
--- scummvm/trunk/engines/scumm/nut_renderer.cpp	2007-01-27 02:26:37 UTC (rev 25223)
+++ scummvm/trunk/engines/scumm/nut_renderer.cpp	2007-01-27 02:30:17 UTC (rev 25224)
@@ -159,7 +159,7 @@
 	}
 
 	uint32 tag = file.readUint32BE();
-	if (tag != 'ANIM') {
+	if (tag != MKID_BE('ANIM')) {
 		error("NutRenderer::loadFont() there is no ANIM chunk in font header");
 	}
 
@@ -168,7 +168,7 @@
 	file.read(dataSrc, length);
 	file.close();
 
-	if (READ_BE_UINT32(dataSrc) != 'AHDR') {
+	if (READ_BE_UINT32(dataSrc) != MKID_BE('AHDR')) {
 		error("NutRenderer::loadFont() there is no AHDR chunk in font header");
 	}
 
@@ -204,12 +204,12 @@
 	offset = 0;
 	for (int l = 0; l < _numChars; l++) {
 		offset += READ_BE_UINT32(dataSrc + offset + 4) + 8;
-		if (READ_BE_UINT32(dataSrc + offset) != 'FRME') {
+		if (READ_BE_UINT32(dataSrc + offset) != MKID_BE('FRME')) {
 			error("NutRenderer::loadFont(%s) there is no FRME chunk %d (offset %x)", filename, l, offset);
 			break;
 		}
 		offset += 8;
-		if (READ_BE_UINT32(dataSrc + offset) != 'FOBJ') {
+		if (READ_BE_UINT32(dataSrc + offset) != MKID_BE('FOBJ')) {
 			error("NutRenderer::loadFont(%s) there is no FOBJ chunk in FRME chunk %d (offset %x)", filename, l, offset);
 			break;
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list