diff options
| author | Max Horn | 2008-09-13 16:51:46 +0000 |
|---|---|---|
| committer | Max Horn | 2008-09-13 16:51:46 +0000 |
| commit | 655ce26b3f09628d9408a4d82efe3a26116999fe (patch) | |
| tree | 779a25dbe25c8f916fb385b3dd2d48e0e379d9ec /engines/saga/rscfile.cpp | |
| parent | b86a047164b54c20366fcbe21b55bf63f2ced5f4 (diff) | |
| download | scummvm-rg350-655ce26b3f09628d9408a4d82efe3a26116999fe.tar.gz scummvm-rg350-655ce26b3f09628d9408a4d82efe3a26116999fe.tar.bz2 scummvm-rg350-655ce26b3f09628d9408a4d82efe3a26116999fe.zip | |
Big patch changing the signature of various Stream methods (some ports may need to be slightly tweaked to fix overloading errors/warnings)
svn-id: r34514
Diffstat (limited to 'engines/saga/rscfile.cpp')
| -rw-r--r-- | engines/saga/rscfile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/saga/rscfile.cpp b/engines/saga/rscfile.cpp index d1ad46a6fc..05b1162973 100644 --- a/engines/saga/rscfile.cpp +++ b/engines/saga/rscfile.cpp @@ -121,7 +121,7 @@ bool Resource::loadSagaContext(ResourceContext *context, uint32 contextOffset, u resourceData->offset = contextOffset + readS1.readUint32(); resourceData->size = readS1.readUint32(); //sanity check - if ((resourceData->offset > context->file->size()) || (resourceData->size > contextSize)) { + if ((resourceData->offset > (uint)context->file->size()) || (resourceData->size > contextSize)) { result = false; break; } @@ -181,8 +181,8 @@ bool Resource::loadMacContext(ResourceContext *context) { macDataLength = context->file->readUint32BE(); macMapLength = context->file->readUint32BE(); - if (macDataOffset >= context->file->size() || macMapOffset >= context->file->size() || - macDataLength + macMapLength > context->file->size()) { + if (macDataOffset >= (uint)context->file->size() || macMapOffset >= (uint)context->file->size() || + macDataLength + macMapLength > (uint)context->file->size()) { return false; } |