diff options
| author | Max Horn | 2009-02-21 04:25:56 +0000 |
|---|---|---|
| committer | Max Horn | 2009-02-21 04:25:56 +0000 |
| commit | 7c87b4901dd6de93511cf7995931b64e59d13fef (patch) | |
| tree | 3886d975a45c3b65a540f350e91a58aabb2cf220 /engines/sci/gfx | |
| parent | cb6b1fc90303cff2f7bff4533fbb2644c4373bec (diff) | |
| download | scummvm-rg350-7c87b4901dd6de93511cf7995931b64e59d13fef.tar.gz scummvm-rg350-7c87b4901dd6de93511cf7995931b64e59d13fef.tar.bz2 scummvm-rg350-7c87b4901dd6de93511cf7995931b64e59d13fef.zip | |
SCI: Use GCC_PRINTF hint to the compiler for _SCIkprintf and sciprintf; fixed tons of bad format strings
svn-id: r38660
Diffstat (limited to 'engines/sci/gfx')
| -rw-r--r-- | engines/sci/gfx/resource/sci_pic_0.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/gfx/resource/sci_view_1.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/gfx/widgets.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/gfx/resource/sci_pic_0.cpp b/engines/sci/gfx/resource/sci_pic_0.cpp index 41ac4a1110..cfe60a585b 100644 --- a/engines/sci/gfx/resource/sci_pic_0.cpp +++ b/engines/sci/gfx/resource/sci_pic_0.cpp @@ -1832,7 +1832,7 @@ gfxr_draw_pic01(gfxr_pic_t *pic, int flags, int default_palette, int size, if (!pic->internal) { pic->internal = sci_malloc(16 * sizeof(int)); } else { - GFXERROR("pic->internal is not NULL (%08x); this only occurs with overlaid pics, otherwise it's a bug", pic->internal); + GFXERROR("pic->internal is not NULL (%p); this only occurs with overlaid pics, otherwise it's a bug", pic->internal); } pri_table = (int*)pic->internal; @@ -1854,7 +1854,7 @@ gfxr_draw_pic01(gfxr_pic_t *pic, int flags, int default_palette, int size, if (!pic->internal) { pic->internal = sci_malloc(16 * sizeof(int)); } else { - GFXERROR("pic->internal is not NULL (%08x); possible memory corruption", pic->internal); + GFXERROR("pic->internal is not NULL (%p); possible memory corruption", pic->internal); } pri_table = (int*)pic->internal; diff --git a/engines/sci/gfx/resource/sci_view_1.cpp b/engines/sci/gfx/resource/sci_view_1.cpp index aef02b694b..eb926c5eae 100644 --- a/engines/sci/gfx/resource/sci_view_1.cpp +++ b/engines/sci/gfx/resource/sci_view_1.cpp @@ -388,7 +388,7 @@ gfxr_draw_view1(int id, byte *resource, int size, gfx_pixmap_color_t *static_pal int loop_offset = get_uint_16(resource + V1_FIRST_LOOP_OFFSET + (i << 1)); if (loop_offset >= size) { - GFXERROR("View %04x:(%d) supposed to be at illegal offset 0x%04x\n", id, i); + GFXERROR("View %04x:(%d) supposed to be at illegal offset 0x%04x\n", id, i, loop_offset); error_token = 1; } diff --git a/engines/sci/gfx/widgets.cpp b/engines/sci/gfx/widgets.cpp index 777d567a32..b01ab3846b 100644 --- a/engines/sci/gfx/widgets.cpp +++ b/engines/sci/gfx/widgets.cpp @@ -889,7 +889,7 @@ _gfxwop_some_view_print(gfxw_widget_t *widget, int indentation, const char *type _gfxw_print_widget(widget, indentation); sciprintf(type_string); - sciprintf(" SORT=%d z=%d seq=%d (%d/%d/%d)@(%d,%d)[p:%d,c:%d]; sig[%04x@%04x]", view->force_precedence, view->z, + sciprintf(" SORT=%d z=%d seq=%d (%d/%d/%d)@(%d,%d)[p:%d,c:%d]; sig[%04x@%p]", view->force_precedence, view->z, view->sequence, view->view, view->loop, view->cel, view->pos.x, view->pos.y, (view->color.mask & GFX_MASK_PRIORITY) ? view->color.priority : -1, (view->color.mask & GFX_MASK_CONTROL) ? view->color.control : -1, @@ -1973,7 +1973,7 @@ _gfxwop_port_free(gfxw_widget_t *widget) { if (visual->port_refs[ID] != port) { GFXWARN("While freeing port %d: Port is at %p, but port list indicates %p", - ID, port, visual->port_refs[ID]); + ID, (void *)port, (void *)visual->port_refs[ID]); } else visual->port_refs[ID] = NULL; } |