[Scummvm-cvs-logs] SF.net SVN: scummvm:[51788] scummvm/trunk/engines/sci/engine/script.cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Fri Aug 6 17:12:03 CEST 2010


Revision: 51788
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51788&view=rev
Author:   m_kiewitz
Date:     2010-08-06 15:12:03 +0000 (Fri, 06 Aug 2010)

Log Message:
-----------
SCI: fix warnings

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/script.cpp

Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp	2010-08-06 15:06:42 UTC (rev 51787)
+++ scummvm/trunk/engines/sci/engine/script.cpp	2010-08-06 15:12:03 UTC (rev 51788)
@@ -168,7 +168,7 @@
 	uint32 DWordOffset = 0;
 	// first search for the magic DWORD
 	while (DWordOffset < searchLimit) {
-		if (magicDWord == *(uint32 *)(scriptData + DWordOffset)) {
+		if (magicDWord == *(const uint32 *)(scriptData + DWordOffset)) {
 			// magic DWORD found, check if actual signature matches
 			uint32 offset = DWordOffset + signature->magicOffset;
 			uint32 byteOffset = offset;
@@ -200,7 +200,7 @@
 	if (g_sci->getGameId() == GID_HOYLE4) {
 		const SciScriptSignature *signatureTable = hoyle4Signatures;
 		while (signatureTable->data) {
-			uint32 foundOffset = findSignature(signatureTable, scriptData, scriptSize);
+			int32 foundOffset = findSignature(signatureTable, scriptData, scriptSize);
 			if (foundOffset != -1) {
 				// found, so apply the patch
 				warning("matched %s on script %d offset %d", signatureTable->description, scriptNr, foundOffset);


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