diff options
| author | Max Horn | 2008-07-22 14:38:54 +0000 |
|---|---|---|
| committer | Max Horn | 2008-07-22 14:38:54 +0000 |
| commit | c92f154b90ef5c09e500978d6e60f9d8f2db1868 (patch) | |
| tree | 34fc4a8ba89f51a3e2487cc33e0432e5f823d9e1 /engines | |
| parent | 5ea9bdd99aac134e739f06b4934a8ff5278633a1 (diff) | |
| download | scummvm-rg350-c92f154b90ef5c09e500978d6e60f9d8f2db1868.tar.gz scummvm-rg350-c92f154b90ef5c09e500978d6e60f9d8f2db1868.tar.bz2 scummvm-rg350-c92f154b90ef5c09e500978d6e60f9d8f2db1868.zip | |
Fix warnings in CINE
svn-id: r33202
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/cine/various.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp index 8e6f3fce76..f3b8cc2582 100644 --- a/engines/cine/various.cpp +++ b/engines/cine/various.cpp @@ -265,7 +265,7 @@ enum CineSaveGameFormat detectSaveGameFormat(Common::SeekableReadStream &fHandle static const uint animEntriesCount = 255; static const uint oldAnimEntrySize = 23; static const uint newAnimEntrySize = 30; - static const uint defaultAnimEntrySize = newAnimEntrySize; +// static const uint defaultAnimEntrySize = newAnimEntrySize; static const uint animEntrySizeChoices[] = {oldAnimEntrySize, newAnimEntrySize}; Common::Array<uint> animEntrySizeMatches; const uint32 prevStreamPos = fHandle.pos(); @@ -338,7 +338,7 @@ enum CineSaveGameFormat detectSaveGameFormat(Common::SeekableReadStream &fHandle fHandle.seek(animDataTableStart + i * animEntrySize + relativeDataPos); uint32 data = fHandle.readUint32BE(); uint32 mask = fHandle.readUint32BE(); - if (data != NULL || mask != NULL) { + if ((data != 0) || (mask != 0)) { pointersIntact = true; break; } |