aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gfx/resmgr.cpp
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2009-02-21 14:11:41 +0000
committerWillem Jan Palenstijn2009-02-21 14:11:41 +0000
commit34f90ac043230f049c58aaaf843ac347e0fc5c21 (patch)
tree36bc91c0e2ff560438f1c8e2f3e7565f82883e79 /engines/sci/gfx/resmgr.cpp
parent7ce7993c30225f3c28ce2a8d68935ef03a6e7175 (diff)
downloadscummvm-rg350-34f90ac043230f049c58aaaf843ac347e0fc5c21.tar.gz
scummvm-rg350-34f90ac043230f049c58aaaf843ac347e0fc5c21.tar.bz2
scummvm-rg350-34f90ac043230f049c58aaaf843ac347e0fc5c21.zip
revert large parts of r38621. error() is for fatal errors and does not return. warning() is not for debugging status messages.
svn-id: r38696
Diffstat (limited to 'engines/sci/gfx/resmgr.cpp')
-rw-r--r--engines/sci/gfx/resmgr.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/gfx/resmgr.cpp b/engines/sci/gfx/resmgr.cpp
index 1d31a57d32..654a859896 100644
--- a/engines/sci/gfx/resmgr.cpp
+++ b/engines/sci/gfx/resmgr.cpp
@@ -68,7 +68,7 @@ gfx_resstate_t *gfxr_new_resource_manager(int version, gfx_options_t *options, g
else {
tree = sbtree_new(entries_nr, resources);
if (!tree) {
- GFXWARN("Failed to allocate tree for %d entries of resource type %d", entries_nr, i);
+ GFXWARN("Failed to allocate tree for %d entries of resource type %d!\n", entries_nr, i);
}
state->resource_trees[i] = tree;
free(resources);
@@ -274,7 +274,7 @@ gfxr_pic_t *gfxr_get_pic(gfx_resstate_t *state, int nr, int maps, int flags, int
pic = gfxr_interpreter_init_pic(state->version, state->driver->mode, GFXR_RES_ID(restype, nr), state->misc_payload);
if (!pic) {
- GFXERROR("Failed to allocate scaled pic");
+ GFXERROR("Failed to allocate scaled pic!\n");
return NULL;
}
@@ -284,7 +284,7 @@ gfxr_pic_t *gfxr_get_pic(gfx_resstate_t *state, int nr, int maps, int flags, int
unscaled_pic = gfxr_interpreter_init_pic(state->version, &mode_1x1_color_index, GFXR_RES_ID(restype, nr),
state->misc_payload);
if (!unscaled_pic) {
- GFXERROR("Failed to allocate unscaled pic");
+ GFXERROR("Failed to allocate unscaled pic!\n");
return NULL;
}
gfxr_interpreter_clear_pic(state->version, unscaled_pic, state->misc_payload);