aboutsummaryrefslogtreecommitdiff
path: root/scumm/smush
diff options
context:
space:
mode:
authorTravis Howell2005-08-14 02:04:26 +0000
committerTravis Howell2005-08-14 02:04:26 +0000
commit18febcb94d9312d9c025e647168364e4ed9ff53a (patch)
tree92669619a7d7507f338febb40ea3686f8deee8db /scumm/smush
parenta820400f8c134a9119b5a2c5b68d614345322f45 (diff)
downloadscummvm-rg350-18febcb94d9312d9c025e647168364e4ed9ff53a.tar.gz
scummvm-rg350-18febcb94d9312d9c025e647168364e4ed9ff53a.tar.bz2
scummvm-rg350-18febcb94d9312d9c025e647168364e4ed9ff53a.zip
Replace warnings with debug, errors or printfs:
-To catch any missing cases/functions used. -To prevent users reporting warnings as bugs svn-id: r18682
Diffstat (limited to 'scumm/smush')
-rw-r--r--scumm/smush/codec47.cpp2
-rw-r--r--scumm/smush/saud_channel.cpp2
-rw-r--r--scumm/smush/smush_font.cpp4
-rw-r--r--scumm/smush/smush_mixer.cpp4
-rw-r--r--scumm/smush/smush_player.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp
index e0430256c5..2a3643e352 100644
--- a/scumm/smush/codec47.cpp
+++ b/scumm/smush/codec47.cpp
@@ -576,7 +576,7 @@ bool Codec47Decoder::decode(byte *dst, const byte *src) {
memcpy(_curBuf, gfx_data, _frameSize);
break;
case 1:
- warning("codec47: not implemented decode1 proc");
+ error("codec47: not implemented decode1 proc");
break;
case 2:
if (seq_nb == _prevSeqNb + 1) {
diff --git a/scumm/smush/saud_channel.cpp b/scumm/smush/saud_channel.cpp
index 3e18df42e5..566ef49310 100644
--- a/scumm/smush/saud_channel.cpp
+++ b/scumm/smush/saud_channel.cpp
@@ -41,7 +41,7 @@ void SaudChannel::handleSmrk(Chunk &b) {
void SaudChannel::handleShdr(Chunk &b) {
int32 size = b.getSize();
if (size != 4)
- warning("SMRK has a invalid size : %d", size);
+ error("SMRK has a invalid size : %d", size);
}
bool SaudChannel::handleSubTags(int32 &offset) {
diff --git a/scumm/smush/smush_font.cpp b/scumm/smush/smush_font.cpp
index 2fc498c696..f8ee6a0127 100644
--- a/scumm/smush/smush_font.cpp
+++ b/scumm/smush/smush_font.cpp
@@ -38,7 +38,7 @@ SmushFont::SmushFont(ScummEngine *vm, bool use_original_colors, bool new_colors)
int SmushFont::getStringWidth(const char *str) {
assert(str);
if (!_loaded) {
- warning("SmushFont::getStringWidth() Font is not loaded");
+ error("SmushFont::getStringWidth() Font is not loaded");
return 0;
}
@@ -56,7 +56,7 @@ int SmushFont::getStringWidth(const char *str) {
int SmushFont::getStringHeight(const char *str) {
assert(str);
if (!_loaded) {
- warning("SmushFont::getStringHeight() Font is not loaded");
+ error("SmushFont::getStringHeight() Font is not loaded");
return 0;
}
diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp
index 773e09a97e..ea5e0ba274 100644
--- a/scumm/smush/smush_mixer.cpp
+++ b/scumm/smush/smush_mixer.cpp
@@ -69,7 +69,7 @@ void SmushMixer::addChannel(SmushChannel *c) {
for (i = 0; i < NUM_CHANNELS; i++) {
if (_channels[i].id == track)
- warning("SmushMixer::addChannel(%d): channel already exists", track);
+ debugC(DEBUG_SMUSH, "SmushMixer::addChannel(%d): channel already exists", track);
}
for (i = 0; i < NUM_CHANNELS; i++) {
@@ -81,7 +81,7 @@ void SmushMixer::addChannel(SmushChannel *c) {
}
for (i = 0; i < NUM_CHANNELS; i++) {
- warning("channel %d : %p(%d, %d)", i, (void *)_channels[i].chan,
+ debugC(DEBUG_SMUSH, "channel %d : %p(%d, %d)", i, (void *)_channels[i].chan,
_channels[i].chan ? _channels[i].chan->getTrackIdentifier() : -1,
_channels[i].chan ? _channels[i].chan->isTerminated() : 1);
}
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 9ce66eb44e..8c3db2f1ad 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -637,7 +637,7 @@ void SmushPlayer::handleTextResource(Chunk &b) {
sf->drawStringWrap(str, _dst, _width, _height, pos_x, MAX(pos_y, top), left, MIN(left + right, _width), true);
break;
default:
- warning("SmushPlayer::handleTextResource. Not handled flags: %d", flags);
+ error("SmushPlayer::handleTextResource. Not handled flags: %d", flags);
}
if (string != NULL) {