[Scummvm-cvs-logs] SF.net SVN: scummvm: [30523] scummvm/trunk/engines/kyra/staticres.cpp

[vinterstum at users.sourceforge.net]

Revision: 30523
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30523&view=rev
Author:   vinterstum
Date:     2008-01-16 14:41:48 -0800 (Wed, 16 Jan 2008)

Log Message:
-----------
Fixed some warnings

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/staticres.cpp

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2008-01-16 22:24:23 UTC (rev 30522)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2008-01-16 22:41:48 UTC (rev 30523)
@@ -994,7 +994,7 @@
 		0 // XXX
 	};*/
 
-	uint16 *hdr = (uint16*) seqData;
+	const uint16 *hdr = (const uint16 *) seqData;
 	uint16 numSeq = READ_LE_UINT16(hdr++);
 	uint16 hdrSize = READ_LE_UINT16(hdr) - 1;
 
@@ -1030,7 +1030,7 @@
 		_sequences[i].callback = cb[i];
 	}
 
-	if (hdr > ((uint16*)(seqData + hdrSize)))
+	if (hdr > ((const uint16*)(seqData + hdrSize)))
 		return;
 
 	numSeq = READ_LE_UINT16(hdr++);
@@ -1057,7 +1057,7 @@
 		offset += 2;
 		_nSequences[i].finalCommand = READ_LE_UINT16(offset);
 		_nSequences[i].callback = ncb[i];
-		_nSequences[i].wsaControl = ctrlOffs ? (uint16*) (seqData + ctrlOffs) : 0;
+		_nSequences[i].wsaControl = ctrlOffs ? (const uint16*) (seqData + ctrlOffs) : 0;
 	}
 }
 


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