aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2009-02-20 23:19:47 +0000
committerFilippos Karapetis2009-02-20 23:19:47 +0000
commit80868065e64000b4f25ad7d6207376ceffabc969 (patch)
tree960de1b08c17f8ba47849b2bae247b6b8be5658a /engines
parent65f7ba86ce4a038ec33559fc8fbf00d5d5901968 (diff)
downloadscummvm-rg350-80868065e64000b4f25ad7d6207376ceffabc969.tar.gz
scummvm-rg350-80868065e64000b4f25ad7d6207376ceffabc969.tar.bz2
scummvm-rg350-80868065e64000b4f25ad7d6207376ceffabc969.zip
Downgraded some errors to warnings and printf's
svn-id: r38642
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/sfx/iterator.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp
index cf1e6db059..5337f05230 100644
--- a/engines/sci/sfx/iterator.cpp
+++ b/engines/sci/sfx/iterator.cpp
@@ -1823,14 +1823,14 @@ songit_next(song_iterator_t **it, unsigned char *buf, int *result, int mask) {
do {
retval = (*it)->next(*it, buf, result);
if (retval == SI_MORPH) {
- error(" Morphing %p (stored at %p)\n", (void *)*it, (void *)it);
+ printf(" Morphing %p (stored at %p)\n", (void *)*it, (void *)it);
if (!SIMSG_SEND((*it), SIMSG_ACK_MORPH)) {
BREAKPOINT();
- } else error("SI_MORPH successful\n");
+ } else printf("SI_MORPH successful\n");
}
if (retval == SI_FINISHED)
- error("[song-iterator] Song finished. mask = %04x, cm=%04x\n",
+ printf("[song-iterator] Song finished. mask = %04x, cm=%04x\n",
mask, (*it)->channel_mask);
if (retval == SI_FINISHED
&& (mask & IT_READER_MAY_CLEAN)
@@ -1873,8 +1873,8 @@ songit_new(unsigned char *data, unsigned int size, int type, songit_id_t id) {
int i;
if (!data || size < 22) {
- error(SIPFX "Attempt to instantiate song iterator for null"
- " song data\n");
+ warning(SIPFX "Attempt to instantiate song iterator for null"
+ " song data");
return NULL;
}
@@ -1923,7 +1923,7 @@ songit_new(unsigned char *data, unsigned int size, int type, songit_id_t id) {
default:
/**-- Invalid/unsupported sound resources --**/
- error(SIPFX "Attempt to instantiate invalid/unknown"
+ warning(SIPFX "Attempt to instantiate invalid/unknown"
" song iterator type %d\n", type);
return NULL;
}