[Scummvm-cvs-logs] SF.net SVN: scummvm: [25560] scummvm/trunk/engines

cyx at users.sourceforge.net cyx at users.sourceforge.net
Tue Feb 13 21:58:20 CET 2007


Revision: 25560
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25560&view=rev
Author:   cyx
Date:     2007-02-13 12:58:20 -0800 (Tue, 13 Feb 2007)

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

Modified Paths:
--------------
    scummvm/trunk/engines/queen/queen.cpp
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.cpp
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
    scummvm/trunk/engines/scumm/insane/insane.cpp

Modified: scummvm/trunk/engines/queen/queen.cpp
===================================================================
--- scummvm/trunk/engines/queen/queen.cpp	2007-02-13 20:56:48 UTC (rev 25559)
+++ scummvm/trunk/engines/queen/queen.cpp	2007-02-13 20:58:20 UTC (rev 25560)
@@ -291,7 +291,7 @@
 	char name[20];
 	makeGameStateName(slot, name);
 	Common::InSaveFile *file = _saveFileMan->openForLoading(name);
-	if (file && file->readUint32BE() == 'SCVM') {
+	if (file && file->readUint32BE() == MKID_BE('SCVM')) {
 		gsh->version = file->readUint32BE();
 		gsh->flags = file->readUint32BE();
 		gsh->dataSize = file->readUint32BE();

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.cpp	2007-02-13 20:56:48 UTC (rev 25559)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.cpp	2007-02-13 20:58:20 UTC (rev 25560)
@@ -89,7 +89,7 @@
 			error("BundleDirCache::matchFileFile() Can't find free slot for file bundle dir cache");
 
 		tag = file.readUint32BE();
-		if (tag == 'LB23')
+		if (tag == MKID_BE('LB23'))
 			_budleDirCache[freeSlot].compressedBun = true;
 		offset = file.readUint32BE();
 
@@ -109,7 +109,7 @@
 			int32 z = 0;
 			int32 z2;
 
-			if (tag == 'LB23') {
+			if (tag == MKID_BE('LB23')) {
 				file.read(_budleDirCache[freeSlot].bundleTable[i].filename, 24);
 			} else {
 				for (z2 = 0; z2 < 8; z2++)

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp	2007-02-13 20:56:48 UTC (rev 25559)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp	2007-02-13 20:58:20 UTC (rev 25560)
@@ -90,7 +90,7 @@
 
 	file->seek(offset, SEEK_SET);
 	uint32 tag = file->readUint32BE();
-	assert(tag == 'RMAP');
+	assert(tag == MKID_BE('RMAP'));
 	int32 version = file->readUint32BE();
 	if (version != 2) {
 		error("ImuseDigiSndMgr::prepareSoundFromRMAP: Wrong version number, expected 2, but it's: %d.", version);

Modified: scummvm/trunk/engines/scumm/insane/insane.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane.cpp	2007-02-13 20:56:48 UTC (rev 25559)
+++ scummvm/trunk/engines/scumm/insane/insane.cpp	2007-02-13 20:58:20 UTC (rev 25560)
@@ -1422,7 +1422,7 @@
 	_smush_setupsan1 = setupsan1;
 
 	/* skip FLUP marker */
-	if (READ_BE_UINT32(fluPtr) == 'FLUP')
+	if (READ_BE_UINT32(fluPtr) == MKID_BE('FLUP'))
 		tmp += 8;
 
 	_smush_setupsan2 = setupsan2;


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