diff options
| author | Max Horn | 2003-05-21 18:16:01 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-21 18:16:01 +0000 |
| commit | cc2f0e634345ccc67792c825904695635336c8bb (patch) | |
| tree | 231f5223e01ebf0dc45052c2af5dc66637c624a5 /scumm | |
| parent | 86d57f3c7af8fd0d4c6a4d1751ccdaac77c3b2e8 (diff) | |
| download | scummvm-rg350-cc2f0e634345ccc67792c825904695635336c8bb.tar.gz scummvm-rg350-cc2f0e634345ccc67792c825904695635336c8bb.tar.bz2 scummvm-rg350-cc2f0e634345ccc67792c825904695635336c8bb.zip | |
yet more pedantic warning fixes
svn-id: r7796
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/smush/chunk.cpp | 4 | ||||
| -rw-r--r-- | scumm/smush/codec37.cpp | 2 | ||||
| -rw-r--r-- | scumm/smush/codec47.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scumm/smush/chunk.cpp b/scumm/smush/chunk.cpp index fc6c0d2323..e25f0e7737 100644 --- a/scumm/smush/chunk.cpp +++ b/scumm/smush/chunk.cpp @@ -150,7 +150,7 @@ bool FileChunk::seek(int32 delta, seek_type dir) { _curPos = (uint32)delta; break; case seek_end: - if(delta > 0 || (_size + delta) < 0) + if(delta > 0 || _size < (uint32)-delta) error("invalid seek request"); _curPos = (uint32)(_size + delta); @@ -263,7 +263,7 @@ bool ContChunk::seek(int32 delta, seek_type dir) { _curPos = (uint32)delta; break; case seek_end: - if(delta > 0 || (_size + delta) < 0) error("invalid seek request"); + if(delta > 0 || _size < (uint32)-delta) error("invalid seek request"); _curPos = (uint32)(_size + delta); break; } diff --git a/scumm/smush/codec37.cpp b/scumm/smush/codec37.cpp index 1d231d58e6..ec0fde5289 100644 --- a/scumm/smush/codec37.cpp +++ b/scumm/smush/codec37.cpp @@ -304,7 +304,7 @@ void Codec37Decoder::bompDecode(byte *dst, const byte *src, int len) { *(uint32 *)(dst) = v #define COPY_4X1_LINE(dst, src) \ - *(uint32 *)(dst) = *(uint32 *)(src) + *(uint32 *)(dst) = *(const uint32 *)(src) #endif /* SCUMM_NEED_ALIGNMENT */ diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp index 376c67626d..f3f5858c69 100644 --- a/scumm/smush/codec47.cpp +++ b/scumm/smush/codec47.cpp @@ -44,10 +44,10 @@ #else /* SCUMM_NEED_ALIGNMENT */ #define COPY_4X1_LINE(dst, src) \ - *(uint32 *)(dst) = *(uint32 *)(src) + *(uint32 *)(dst) = *(const uint32 *)(src) #define COPY_2X1_LINE(dst, src) \ - *(uint16 *)(dst) = *(uint16 *)(src) + *(uint16 *)(dst) = *(const uint16 *)(src) #endif |