[Scummvm-cvs-logs] SF.net SVN: scummvm:[38550] scummvm/trunk/engines/sci/exereader.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Thu Feb 19 15:47:30 CET 2009


Revision: 38550
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38550&view=rev
Author:   thebluegr
Date:     2009-02-19 14:47:30 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Corrected erroneous use of MKID_BE

Modified Paths:
--------------
    scummvm/trunk/engines/sci/exereader.cpp

Modified: scummvm/trunk/engines/sci/exereader.cpp
===================================================================
--- scummvm/trunk/engines/sci/exereader.cpp	2009-02-19 14:40:24 UTC (rev 38549)
+++ scummvm/trunk/engines/sci/exereader.cpp	2009-02-19 14:47:30 UTC (rev 38550)
@@ -80,9 +80,11 @@
 		return true;
 
 	// Check if it's a Mac exe
-	// Is there a better way to do this?
-	// FIXME: MKID_BE() does /not/ work that way.
-	int32 offset = 0; //MKID_BE(magic) + 28;	// Resource map offset
+	// TODO: Is there a better way to do this?
+
+	// Resource map offset
+	int32 offset = (magic[0] << 24) | (magic[1] << 16) | (magic[2] << 8) | magic[3];
+	offset += 28;
 	if (exeStream->size() <= offset)
 		return false;
 


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