diff options
| author | Paul Gilbert | 2018-11-16 20:38:25 -0800 |
|---|---|---|
| committer | Paul Gilbert | 2018-12-08 19:05:59 -0800 |
| commit | bc4df65bd7b81dc5cec98f6681e9d83f7c22dc8e (patch) | |
| tree | 8dd8ac087d1d07a161fa0da72a037bb021e6453f /engines/glk/blorb.cpp | |
| parent | fc2b1edd1fd6227e9495ada72840e9434f9095fa (diff) | |
| download | scummvm-rg350-bc4df65bd7b81dc5cec98f6681e9d83f7c22dc8e.tar.gz scummvm-rg350-bc4df65bd7b81dc5cec98f6681e9d83f7c22dc8e.tar.bz2 scummvm-rg350-bc4df65bd7b81dc5cec98f6681e9d83f7c22dc8e.zip | |
GLK: Fix gcc compiler warnings
Diffstat (limited to 'engines/glk/blorb.cpp')
| -rw-r--r-- | engines/glk/blorb.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/glk/blorb.cpp b/engines/glk/blorb.cpp index e298e1ccc3..ed730bfa8a 100644 --- a/engines/glk/blorb.cpp +++ b/engines/glk/blorb.cpp @@ -35,7 +35,7 @@ struct giblorb_chunkdesc_struct { glui32 startpos; ///< start of chunk header glui32 datpos; ///< start of data (either startpos or startpos+8) - void *ptr; ///< pointer to malloc'd data, if loaded + byte *ptr; ///< pointer to malloc'd data, if loaded int auxdatnum; ///< entry in the auxsound/auxpict array; -1 if none. This only applies to chunks that represent resources; }; typedef giblorb_chunkdesc_struct giblorb_chunkdesc_t; @@ -406,7 +406,7 @@ giblorb_err_t Blorb::giblorb_load_chunk_by_number(giblorb_map_t *map, glui32 method, giblorb_result_t *res, glui32 chunknum) { giblorb_chunkdesc_t *chu; - if (chunknum < 0 || chunknum >= map->numchunks) + if (chunknum >= map->numchunks) return giblorb_err_NotFound; chu = &(map->chunks[chunknum]); @@ -451,7 +451,7 @@ giblorb_err_t Blorb::giblorb_load_chunk_by_number(giblorb_map_t *map, giblorb_err_t Blorb::giblorb_unload_chunk(giblorb_map_t *map, glui32 chunknum) { giblorb_chunkdesc_t *chu; - if (chunknum < 0 || chunknum >= map->numchunks) + if (chunknum >= map->numchunks) return giblorb_err_NotFound; chu = &(map->chunks[chunknum]); |