thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: fix warnings

Browse source 
svn-id: r51788
This commit is contained in:
Martin Kiewitz 2010-08-06 15:12:03 +00:00
parent 2a4768401e
commit afed447b6f
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/sci/engine/script.cpp
View file

@ -168,7 +168,7 @@ int32 Script::findSignature(const SciScriptSignature *signature, const byte *scr
uint32 DWordOffset = 0; uint32 DWordOffset = 0;
// first search for the magic DWORD // first search for the magic DWORD
while (DWordOffset < searchLimit) { while (DWordOffset < searchLimit) {
if (magicDWord == *(uint32 *)(scriptData + DWordOffset)) { if (magicDWord == *(const uint32 *)(scriptData + DWordOffset)) {
// magic DWORD found, check if actual signature matches // magic DWORD found, check if actual signature matches
uint32 offset = DWordOffset + signature->magicOffset; uint32 offset = DWordOffset + signature->magicOffset;
uint32 byteOffset = offset; uint32 byteOffset = offset;
@ -200,7 +200,7 @@ void Script::matchSignatureAndPatch(uint16 scriptNr, const byte *scriptData, con
if (g_sci->getGameId() == GID_HOYLE4) { if (g_sci->getGameId() == GID_HOYLE4) {
const SciScriptSignature *signatureTable = hoyle4Signatures; const SciScriptSignature *signatureTable = hoyle4Signatures;
while (signatureTable->data) { while (signatureTable->data) {
uint32 foundOffset = findSignature(signatureTable, scriptData, scriptSize); int32 foundOffset = findSignature(signatureTable, scriptData, scriptSize);
if (foundOffset != -1) { if (foundOffset != -1) {
// found, so apply the patch // found, so apply the patch
warning("matched %s on script %d offset %d", signatureTable->description, scriptNr, foundOffset); warning("matched %s on script %d offset %d", signatureTable->description, scriptNr, foundOffset);