diff options
author | Filippos Karapetis | 2009-02-15 16:45:39 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-02-15 16:45:39 +0000 |
commit | 06186502b2bfa413e7d09c12ed691e9bcf6acbaf (patch) | |
tree | a3bc8363648b5c194277084604b31fe9b91802f8 /engines/sci/sfx | |
parent | aff0a0daac4d2bff6e2731e7c1ecaf25ce4f1eb8 (diff) | |
download | scummvm-rg350-06186502b2bfa413e7d09c12ed691e9bcf6acbaf.tar.gz scummvm-rg350-06186502b2bfa413e7d09c12ed691e9bcf6acbaf.tar.bz2 scummvm-rg350-06186502b2bfa413e7d09c12ed691e9bcf6acbaf.zip |
Silenced more warnings
svn-id: r38267
Diffstat (limited to 'engines/sci/sfx')
-rw-r--r-- | engines/sci/sfx/iterator.cpp | 4 | ||||
-rw-r--r-- | engines/sci/sfx/softseq/amiga.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp index a7e66497ea..c54ff01732 100644 --- a/engines/sci/sfx/iterator.cpp +++ b/engines/sci/sfx/iterator.cpp @@ -753,7 +753,7 @@ _sci1_sample_init(sci1_song_iterator_t *self, int offset) int begin; int end; - CHECK_FOR_END_ABSOLUTE(offset + 10); + CHECK_FOR_END_ABSOLUTE((unsigned int)offset + 10); if (self->data[offset + 1] != 0) sciprintf("[iterator-1] In sample at offset 0x04x: Byte #1 is %02x instead of zero\n", self->data[offset + 1]); @@ -763,7 +763,7 @@ _sci1_sample_init(sci1_song_iterator_t *self, int offset) begin = getInt16(self->data + offset + 6); end = getInt16(self->data + offset + 8); - CHECK_FOR_END_ABSOLUTE(offset + 10 + length); + CHECK_FOR_END_ABSOLUTE((unsigned int)(offset + 10 + length)); sample = (sci1_sample_t*)sci_malloc(sizeof(sci1_sample_t)); sample->delta = begin; diff --git a/engines/sci/sfx/softseq/amiga.cpp b/engines/sci/sfx/softseq/amiga.cpp index ca0d40b689..280f22fa5e 100644 --- a/engines/sci/sfx/softseq/amiga.cpp +++ b/engines/sci/sfx/softseq/amiga.cpp @@ -430,7 +430,7 @@ static instrument_t *read_instrument(FILE *file, int *id) sciprintf(" Segment offsets: 0 %i %i\n", loop_offset, read_int32(header + 43)); #endif instrument->samples = (sbyte *) sci_malloc(size + 1); - if (fread(instrument->samples, 1, size, file) < size) { + if (fread(instrument->samples, 1, size, file) < (unsigned int)size) { sciprintf("[sfx:seq:amiga] Error: failed to read instrument samples\n"); return NULL; } |