aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gfx/resource
diff options
context:
space:
mode:
authorFilippos Karapetis2009-02-20 20:39:02 +0000
committerFilippos Karapetis2009-02-20 20:39:02 +0000
commit2ddce51a56a73acaa2bc1170d6c6ab087e1170c4 (patch)
treea7247ed95e6e2a70c1b05e244509db4f2fb04d61 /engines/sci/gfx/resource
parent1419024bd02aac9c7a3405f34d9cfd6bf38a8447 (diff)
downloadscummvm-rg350-2ddce51a56a73acaa2bc1170d6c6ab087e1170c4.tar.gz
scummvm-rg350-2ddce51a56a73acaa2bc1170d6c6ab087e1170c4.tar.bz2
scummvm-rg350-2ddce51a56a73acaa2bc1170d6c6ab087e1170c4.zip
Changed more messages to warnings/errors
svn-id: r38621
Diffstat (limited to 'engines/sci/gfx/resource')
-rw-r--r--engines/sci/gfx/resource/sci_pic_0.cpp32
-rw-r--r--engines/sci/gfx/resource/sci_view_1.cpp2
2 files changed, 17 insertions, 17 deletions
diff --git a/engines/sci/gfx/resource/sci_pic_0.cpp b/engines/sci/gfx/resource/sci_pic_0.cpp
index ccb8790578..41ac4a1110 100644
--- a/engines/sci/gfx/resource/sci_pic_0.cpp
+++ b/engines/sci/gfx/resource/sci_pic_0.cpp
@@ -375,11 +375,11 @@ _gfxr_auxbuf_spread(gfxr_pic_t *pic, int *min_x, int *min_y, int *max_x, int *ma
#ifdef FILL_RECURSIVE_DEBUG
if (!fillmagc) {
- fprintf(stderr, "------------------------------------------------\n");
- fprintf(stderr, "LineID: ");
+ error("------------------------------------------------\n");
+ error("LineID: ");
for (i = 0; i < 5; i++)
- fprintf(stderr, " %d ", i);
- fprintf(stderr, "\n");
+ error(" %d ", i);
+ error("\n");
}
#endif
@@ -481,10 +481,10 @@ _gfxr_auxbuf_spread(gfxr_pic_t *pic, int *min_x, int *min_y, int *max_x, int *ma
#ifdef FILL_RECURSIVE_DEBUG
if (!fillmagc && intervals_nr) {
- fprintf(stderr, "AI L#%03d:", y);
+ error("AI L#%03d:", y);
for (int j = 0; j < intervals_nr; j++)
- fprintf(stderr, "%c[%03d,%03d]", intervals[ivi][j].tag ? ' ' : '-', intervals[ivi][j].xl, intervals[ivi][j].xr);
- fprintf(stderr, "\n");
+ error("%c[%03d,%03d]", intervals[ivi][j].tag ? ' ' : '-', intervals[ivi][j].xl, intervals[ivi][j].xr);
+ error("\n");
}
#endif
@@ -631,7 +631,7 @@ _gfxr_fill_ellipse(gfxr_pic_t *pic, byte *buffer, int linewidth, int x, int y,
break;
default:
- fprintf(stderr, "%s L%d: Invalid ellipse fill mode!\n", __FILE__, __LINE__);
+ error("%s L%d: Invalid ellipse fill mode", __FILE__, __LINE__);
return;
}
@@ -968,7 +968,7 @@ _gfxr_draw_subline(gfxr_pic_t *pic, int x, int y, int ex, int ey, int color, int
end.y = ey;
if (ex >= pic->visual_map->index_xl || ey >= pic->visual_map->index_yl || x < 0 || y < 0) {
- fprintf(stderr, "While drawing pic0: INVALID LINE %d,%d,%d,%d\n",
+ error("While drawing pic0: INVALID LINE %d,%d,%d,%d\n",
start.x, start.y, end.x, end.y);
return;
}
@@ -1307,7 +1307,7 @@ gfxr_remove_artifacts_pic0(gfxr_pic_t *dest, gfxr_pic_t *src) {
if (bound_x == 1 && bound_y == 1) {
/* D'Oh! */
- GFXWARN("attempt to remove artifacts from unscaled pic!\n");
+ GFXWARN("attempt to remove artifacts from unscaled pic");
return;
}
@@ -1494,12 +1494,12 @@ gfxr_draw_pic01(gfxr_pic_t *pic, int flags, int default_palette, int size,
GET_ABS_COORDS(oldx, oldy);
while (*(resource + pos) < PIC_OP_FIRST) {
#if 0
- fprintf(stderr, "Medium-line: [%04x] from %d,%d, data %02x %02x (dx=%d)", pos, oldx, oldy,
+ error("Medium-line: [%04x] from %d,%d, data %02x %02x (dx=%d)", pos, oldx, oldy,
0xff & resource[pos], 0xff & resource[pos+1], *((signed char *) resource + pos + 1));
#endif
GET_MEDREL_COORDS(oldx, oldy);
#if 0
- fprintf(stderr, " to %d,%d\n", x, y);
+ error(" to %d,%d\n", x, y);
#endif
_gfxr_draw_line(pic, oldx, oldy, x, y, color, priority, control, drawenable, line_mode,
PIC_OP_MEDIUM_LINES, sci_titlebar_size);
@@ -1780,7 +1780,7 @@ gfxr_draw_pic01(gfxr_pic_t *pic, int flags, int default_palette, int size,
*if it's not for some reason, we should die
*/
if (!(view->flags & GFX_PIXMAP_FLAG_EXTERNAL_PALETTE) && !sci1) {
- sciprintf("gfx_draw_pic0(): can't set a non-static palette for an embedded view!\n");
+ sciprintf("gfx_draw_pic0(): can't set a non-static palette for an embedded view");
}
/* For SCI0, use special color mapping to copy the low
@@ -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!\n", pic->internal);
+ GFXERROR("pic->internal is not NULL (%08x); 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!\n", pic->internal);
+ GFXERROR("pic->internal is not NULL (%08x); possible memory corruption", pic->internal);
}
pri_table = (int*)pic->internal;
@@ -1980,7 +1980,7 @@ gfxr_dither_pic0(gfxr_pic_t *pic, int dmode, int pattern) {
break;
default:
- GFXERROR("Invalid dither mode %d!\n", dmode);
+ GFXERROR("Invalid dither mode %d", dmode);
return;
}
diff --git a/engines/sci/gfx/resource/sci_view_1.cpp b/engines/sci/gfx/resource/sci_view_1.cpp
index 7f989b646a..aef02b694b 100644
--- a/engines/sci/gfx/resource/sci_view_1.cpp
+++ b/engines/sci/gfx/resource/sci_view_1.cpp
@@ -347,7 +347,7 @@ gfxr_draw_view1(int id, byte *resource, int size, gfx_pixmap_color_t *static_pal
return NULL;
}
- /* fprintf(stderr, "View flags are 0x%02x\n", resource[3]);*/
+ /* error("View flags are 0x%02x\n", resource[3]);*/
/*
for (i = 0; i < V1_MAGICS_NR; i++)
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-31 15:46:43 +0000