diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/scriptconsole.cpp | 1 | ||||
| -rw-r--r-- | engines/sci/gfx/operations.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/gfx/resource/sci_pic_0.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/scicore/resource.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sfx/iterator.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/sfx/softseq/amiga.cpp | 2 |
6 files changed, 8 insertions, 5 deletions
diff --git a/engines/sci/engine/scriptconsole.cpp b/engines/sci/engine/scriptconsole.cpp index 42200d4b62..aedd685ff6 100644 --- a/engines/sci/engine/scriptconsole.cpp +++ b/engines/sci/engine/scriptconsole.cpp @@ -459,6 +459,7 @@ parse_reg_t(state_t *s, const char *str, reg_t *dest) int valid = 1; object_t *obj = NULL; /* Surpress spurious warning */ reg_t objpos; + objpos.offset = 0; objpos.segment = i; if (mobj->type == MEM_OBJ_SCRIPT) { diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp index 49d693fbb1..9b15034c11 100644 --- a/engines/sci/gfx/operations.cpp +++ b/engines/sci/gfx/operations.cpp @@ -1838,6 +1838,8 @@ gfxop_get_event(gfx_state_t *state, unsigned int mask) { sci_event_t error_event = { SCI_EVT_ERROR, 0, 0 }; sci_event_t event; + event.data = 0; + event.buckybits = 0; gfx_input_event_t **seekerp = &(state->events); BASIC_CHECKS(error_event); diff --git a/engines/sci/gfx/resource/sci_pic_0.cpp b/engines/sci/gfx/resource/sci_pic_0.cpp index 87495dcb10..335a0e2a41 100644 --- a/engines/sci/gfx/resource/sci_pic_0.cpp +++ b/engines/sci/gfx/resource/sci_pic_0.cpp @@ -135,7 +135,7 @@ gfxr_init_static_palette() gfx_sci0_pic_colors[i].b = INTERCOL(gfx_sci0_image_colors[sci0_palette][i & 0xf].b, gfx_sci0_image_colors[sci0_palette][i >> 4].b); } - WARNING("Uncomment me after fixing sci0_palette changes to reset me"); + //WARNING("Uncomment me after fixing sci0_palette changes to reset me"); /* _gfxr_pic0_colors_initialized = 1; */ } } diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp index cd4faf3518..5a60ad1ad8 100644 --- a/engines/sci/scicore/resource.cpp +++ b/engines/sci/scicore/resource.cpp @@ -244,7 +244,7 @@ _scir_init_trivial(resource_mgr_t *mgr) static void _scir_load_from_patch_file(int fh, resource_t *res, char *filename) { - int really_read; + unsigned int really_read; res->data = (unsigned char*)sci_malloc(res->size); really_read = read(fh, res->data, res->size); 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; } |