Replace warnings with debug, errors or printfs:

-To catch any missing cases/functions used.
-To prevent users reporting warnings as bugs

svn-id: r18682

17 files changed, 53 insertions, 58 deletions

diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp
index 88d5b9c193..989ba26660 100644
--- a/scumm/boxes.cpp
+++ b/scumm/boxes.cpp
@@ -761,7 +761,7 @@ int ScummEngine::getPathToDestBox(byte from, byte to) {
 	}
 
 	if (boxm >= end)
-		warning("The box matrix apparently is truncated (room %d)", _roomResource);
+		debug(0, "The box matrix apparently is truncated (room %d)", _roomResource);
 
 	return dest;
 }
diff --git a/scumm/cursor.cpp b/scumm/cursor.cpp
index 2ecf565d7c..5aa5cfe870 100644
--- a/scumm/cursor.cpp
+++ b/scumm/cursor.cpp
@@ -142,7 +142,7 @@ void ScummEngine_v6::grabCursor(int x, int y, int w, int h) {
 	VirtScreen *vs = findVirtScreen(y);
 
 	if (vs == NULL) {
-		warning("grabCursor: invalid Y %d", y);
+		debug(0, "grabCursor: invalid Y %d", y);
 		return;
 	}
 
@@ -338,7 +338,7 @@ void ScummEngine_v5::redefineBuiltinCursorFromChar(int index, int chr) {
 	if (_gameId != GID_LOOM && _gameId != GID_LOOM256) {
 		// FIXME: Actually: is this opcode ever called by a non-Loom game?
 		// Which V3-V5 game besides Loom makes use of custom cursors, ever?
-		warning("V3--V5 SO_CURSOR_IMAGE(%d,%d) called - tell Fingolfin where you saw this!", index, chr);
+		error("V3--V5 SO_CURSOR_IMAGE(%d,%d) called - tell Fingolfin where you saw this!", index, chr);
 	}
 
 	assert(index >= 0 && index < 4);
@@ -382,7 +382,7 @@ void ScummEngine_v5::redefineBuiltinCursorHotspot(int index, int x, int y) {
 	if (_gameId != GID_LOOM && _gameId != GID_LOOM256) {
 		// FIXME: Actually: is this opcode ever called by a non-Loom game?
 		// Which V3-V5 game besides Loom makes use of custom cursors, ever?
-		warning("V3--V5 SO_CURSOR_HOTSPOT(%d,%d,%d) called - tell Fingolfin where you saw this!", index, x, y);
+		error("V3--V5 SO_CURSOR_HOTSPOT(%d,%d,%d) called - tell Fingolfin where you saw this!", index, x, y);
 	}
 
 	assert(index >= 0 && index < 4);
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index a024d79856..69bafe8c35 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -145,7 +145,7 @@ bool IMuseInternal::isMT32(int sound) {
 	if (ptr[8] == 'S' && ptr[9] == 'O')
 		return false;
 
-	warning("Unknown music type: '%s'", tag2str(tag));
+	error("Unknown music type: '%s'", tag2str(tag));
 
 	return false;
 }
@@ -187,7 +187,7 @@ bool IMuseInternal::isMIDI(int sound) {
 	if (ptr[8] == 'S' && ptr[9] == 'O')
 		return true;
 
-	warning("Unknown music type: '%s'", tag2str(tag));
+	error("Unknown music type: '%s'", tag2str(tag));
 
 	return false;
 }
@@ -410,7 +410,7 @@ void IMuseInternal::handle_marker(uint id, byte data) {
 		return;
 
 	if (pos != _queue_end)
-		warning("Skipping entries in iMuse command queue to reach marker");
+		debug(0, "Skipping entries in iMuse command queue to reach marker");
 
 	_trigger_count--;
 	_queue_cleared = false;
@@ -725,11 +725,11 @@ int32 IMuseInternal::doCommand(int numargs, int a[]) {
 			if (a[1] > 127)
 				return -1;
 			else {
-				warning("IMuse doCommand(6) - setImuseMasterVolume (%d)", a[1]);
+				debug(0, "IMuse doCommand(6) - setImuseMasterVolume (%d)", a[1]);
 				return setImuseMasterVolume((a[1] << 1) | (a[1] ? 0 : 1)); // Convert from 0-127 to 0-255
 			}
 		case 7:
-			warning("IMuse doCommand(7) - getMasterVolume (%d)", a[1]);
+			debug(0, "IMuse doCommand(7) - getMasterVolume (%d)", a[1]);
 			return _master_volume / 2; // Convert from 0-255 to 0-127
 		case 8:
 			return startSound(a[1]) ? 0 : -1;
@@ -750,7 +750,7 @@ int32 IMuseInternal::doCommand(int numargs, int a[]) {
 				// Set player volume.
 				return player->setVolume(a[4]);
 			default:
-				warning("IMuseInternal::doCommand(12) unsupported sub-command %d", a[3]);
+				error("IMuseInternal::doCommand(12) unsupported sub-command %d", a[3]);
 			}
 			return -1;
 		case 13:
@@ -771,11 +771,11 @@ int32 IMuseInternal::doCommand(int numargs, int a[]) {
 			}
 			return -1;
 		case 16:
-			warning("IMuse doCommand(16) - set_volchan (%d, %d)", a[1], a[2]);
+			debug(0, "IMuse doCommand(16) - set_volchan (%d, %d)", a[1], a[2]);
 			return set_volchan(a[1], a[2]);
 		case 17:
 			if (g_scumm->_gameId != GID_SAMNMAX) {
-				warning("IMuse doCommand(17) - set_channel_volume (%d, %d)", a[1], a[2]);
+				debug(0, "IMuse doCommand(17) - set_channel_volume (%d, %d)", a[1], a[2]);
 				return set_channel_volume(a[1], a[2]);
 			} else {
 				if (a[4]) {
@@ -820,7 +820,7 @@ int32 IMuseInternal::doCommand(int numargs, int a[]) {
 		case 3:
 			return 0;
 		default:
-			warning("doCommand(%d [%d/%d], %d, %d, %d, %d, %d, %d, %d) unsupported", a[0], param, cmd, a[1], a[2], a[3], a[4], a[5], a[6], a[7]);
+			error("doCommand(%d [%d/%d], %d, %d, %d, %d, %d, %d, %d) unsupported", a[0], param, cmd, a[1], a[2], a[3], a[4], a[5], a[6], a[7]);
 		}
 	} else if (param == 1) {
 		if ((1 << cmd) & 0x783FFF) {
@@ -926,7 +926,7 @@ int32 IMuseInternal::doCommand(int numargs, int a[]) {
 		case 24:
 			return 0;
 		default:
-			warning("doCommand(%d [%d/%d], %d, %d, %d, %d, %d, %d, %d) unsupported", a[0], param, cmd, a[1], a[2], a[3], a[4], a[5], a[6], a[7]);
+			error("doCommand(%d [%d/%d], %d, %d, %d, %d, %d, %d, %d) unsupported", a[0], param, cmd, a[1], a[2], a[3], a[4], a[5], a[6], a[7]);
 			return -1;
 		}
 	}
@@ -1756,7 +1756,7 @@ void Part::noteOn(byte note, byte velocity) {
 	if (_unassigned_instrument && !_percussion) {
 		_unassigned_instrument = false;
 		if (!_instrument.isValid()) {
-			warning("[%02d] No instrument specified", (int)_chan);
+			debug(0, "[%02d] No instrument specified", (int)_chan);
 			return;
 		}
 	}
@@ -1885,7 +1885,7 @@ void Part::programChange(byte value) {
 void Part::set_instrument(uint b) {
 	_bank = (byte)(b >> 8);
 	if (_bank)
-		warning("Non-zero instrument bank selection. Please report this");
+		error("Non-zero instrument bank selection. Please report this");
 	_instrument.program((byte)b, _player->isMT32());
 	if (clearToTransmit())
 		_instrument.send(_mc);
diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp
index 8d2fc62982..5ba6a5bd3a 100644
--- a/scumm/imuse_player.cpp
+++ b/scumm/imuse_player.cpp
@@ -98,7 +98,7 @@ bool Player::startSound(int sound, MidiDriver *midi, bool passThrough) {
 	// but we'll go ahead and do a similar check.
 	ptr = _se->findStartOfSound(sound);
 	if (!ptr) {
-		warning("Player::startSound(): Couldn't find start of sound %d!", sound);
+		error("Player::startSound(): Couldn't find start of sound %d!", sound);
 		return false;
 	}
 
@@ -305,7 +305,7 @@ void Player::send(uint32 b) {
 			part->allNotesOff();
 			break;
 		default:
-			warning("Player::send(): Invalid control change %d", param1);
+			error("Player::send(): Invalid control change %d", param1);
 		}
 		break;
 
@@ -335,7 +335,7 @@ void Player::send(uint32 b) {
 
 	default:
 		if (!_scanning) {
-			warning("Player::send(): Invalid command %d", cmd);
+			error("Player::send(): Invalid command %d", cmd);
 			clear();
 		}
 	}
@@ -370,7 +370,7 @@ void Player::sysEx(byte *p, uint16 len) {
 			// FM-TOWNS custom instrument definition
 			_midi->sysEx_customInstrument(p[0], 'EUP ', p + 1);
 		} else {
-			warning("Unknown SysEx manufacturer 0x%02X", (int)a);
+			error("Unknown SysEx manufacturer 0x%02X", (int)a);
 		}
 		return;
 	}
@@ -552,7 +552,7 @@ void Player::sysEx(byte *p, uint16 len) {
 		break;
 
 	default:
-		warning("Unknown SysEx command %d", (int)code);
+		error("Unknown SysEx command %d", (int)code);
 	}
 }
 
@@ -773,7 +773,7 @@ Part *Player::getPart(uint8 chan) {
 
 	part = _se->allocate_part(_priority, _midi);
 	if (!part) {
-		warning("no parts available");
+		error("no parts available");
 		return NULL;
 	}
 
@@ -1016,7 +1016,7 @@ int Player::addParameterFader(int param, int target, int time) {
 	case ParameterFader::pfTranspose:
 		// FIXME: Is this transpose? And what's the scale?
 		// It's set to fade to -2400 in the tunnel of love.
-//		warning("parameterTransition(3) outside Tunnel of Love?");
+//		debug(0, "parameterTransition(3) outside Tunnel of Love?");
 		start = _transpose;
 //		target /= 200;
 		break;
@@ -1039,7 +1039,7 @@ int Player::addParameterFader(int param, int target, int time) {
 		break;
 
 	default:
-		warning("Player::addParameterFader (%d, %d, %d): Unknown parameter", param, target, time);
+		debug(0, "Player::addParameterFader (%d, %d, %d): Unknown parameter", param, target, time);
 		return 0; // Should be -1, but we'll let the script think it worked.
 	}
 
@@ -1066,7 +1066,7 @@ int Player::addParameterFader(int param, int target, int time) {
 			best->total_time = (uint32)time * 10000;
 		best->current_time = 0;
 	} else {
-		warning("IMuse Player %d: Out of parameter faders", _id);
+		debug(0, "IMuse Player %d: Out of parameter faders", _id);
 		return -1;
 	}
 
diff --git a/scumm/insane/insane.cpp b/scumm/insane/insane.cpp
index f65dd599cb..aed10e6d1c 100644
--- a/scumm/insane/insane.cpp
+++ b/scumm/insane/insane.cpp
@@ -1288,7 +1288,7 @@ void Insane::smlayer_showStatusMsg(int32 arg_0, byte *renderBitmap, int32 codecp
 		sf->drawStringWrap(str, renderBitmap, _player->_width, _player->_height, pos_x, pos_y, 10, 300, true);
 		break;
 	default:
-		warning("Insane::smlayer_showStatusMsg. Not handled flags: %d", flags);
+		error("Insane::smlayer_showStatusMsg. Not handled flags: %d", flags);
 	}
 	free (string);
 }
diff --git a/scumm/insane/insane_scenes.cpp b/scumm/insane/insane_scenes.cpp
index ad41b62985..a805425819 100644
--- a/scumm/insane/insane_scenes.cpp
+++ b/scumm/insane/insane_scenes.cpp
@@ -133,8 +133,7 @@ void Insane::runScene(int arraynum) {
 		startVideo("credits.san", 1, 32, 12, 0);
 		break;
 	default:
-		warning("Unknown FT_INSANE mode %d", readArray(0));
-		break;
+		error("Unknown FT_INSANE mode %d", readArray(0));
 	}
 
 	putActors();
diff --git a/scumm/logic_he.cpp b/scumm/logic_he.cpp
index 42f7bd1c09..c0f177d775 100644
--- a/scumm/logic_he.cpp
+++ b/scumm/logic_he.cpp
@@ -618,10 +618,7 @@ int32 LogicHEfootball::dispatch(int op, int numArgs, int32 *args) {
 
 	default:
 		LogicHE::dispatch(op, numArgs, args);
-		warning("Tell me how to reproduce it");
-		assert(0);
-		break;
-
+		error("Tell me how to reproduce it");
 	}
 
 	return res;
diff --git a/scumm/midiparser_eup.cpp b/scumm/midiparser_eup.cpp
index 3d06b05f2c..50a2f3f174 100644
--- a/scumm/midiparser_eup.cpp
+++ b/scumm/midiparser_eup.cpp
@@ -148,7 +148,7 @@ void MidiParser_EUP::parseNextEvent (EventInfo &info) {
 				break;
 			}
 		} else {
-			warning("Unknown Euphony music event 0x%02X", (int) cmd);
+			error("Unknown Euphony music event 0x%02X", (int) cmd);
 			memset(&info, 0, sizeof(info));
 			pos = 0;
 			break;
@@ -163,7 +163,7 @@ bool MidiParser_EUP::loadMusic (byte *data, uint32 size) {
 	int i;
 
 	if (memcmp(pos, "SO", 2)) {
-		warning("'SO' header expected but found '%c%c' instead.", pos[0], pos[1]);
+		error("'SO' header expected but found '%c%c' instead.", pos[0], pos[1]);
 		return false;
 	}
 
diff --git a/scumm/midiparser_ro.cpp b/scumm/midiparser_ro.cpp
index bca7524da3..b7882c4b04 100644
--- a/scumm/midiparser_ro.cpp
+++ b/scumm/midiparser_ro.cpp
@@ -119,7 +119,7 @@ bool MidiParser_RO::loadMusic (byte *data, uint32 size) {
 	byte *pos = data;
 
 	if (memcmp (pos, "RO", 2)) {
-		warning("'RO' header expected but found '%c%c' instead", pos[0], pos[1]);
+		error("'RO' header expected but found '%c%c' instead", pos[0], pos[1]);
 		return false;
 	}
 
diff --git a/scumm/nut_renderer.cpp b/scumm/nut_renderer.cpp
index c7a9fd00c4..5c285345cd 100644
--- a/scumm/nut_renderer.cpp
+++ b/scumm/nut_renderer.cpp
@@ -70,19 +70,19 @@ static void smush_decode_codec21(byte *dst, const byte *src, int width, int heig
 
 bool NutRenderer::loadFont(const char *filename) {
 	if (_loaded) {
-		warning("NutRenderer::loadFont() Font already loaded, ok, loading...");
+		debug(0, "NutRenderer::loadFont() Font already loaded, ok, loading...");
 	}
 
 	ScummFile file;
 	_vm->openFile(file, filename);
 	if (file.isOpen() == false) {
-		warning("NutRenderer::loadFont() Can't open font file: %s", filename);
+		error("NutRenderer::loadFont() Can't open font file: %s", filename);
 		return false;
 	}
 
 	uint32 tag = file.readUint32BE();
 	if (tag != 'ANIM') {
-		warning("NutRenderer::loadFont() there is no ANIM chunk in font header");
+		error("NutRenderer::loadFont() there is no ANIM chunk in font header");
 		return false;
 	}
 
@@ -92,7 +92,7 @@ bool NutRenderer::loadFont(const char *filename) {
 	file.close();
 
 	if (READ_BE_UINT32(dataSrc) != 'AHDR') {
-		warning("NutRenderer::loadFont() there is no AHDR chunk in font header");
+		error("NutRenderer::loadFont() there is no AHDR chunk in font header");
 		free(dataSrc);
 		return false;
 	}
@@ -103,12 +103,12 @@ bool NutRenderer::loadFont(const char *filename) {
 	for (int l = 0; l < _numChars; l++) {
 		offset += READ_BE_UINT32(dataSrc + offset + 4) + 8;
 		if (READ_BE_UINT32(dataSrc + offset) != 'FRME') {
-			warning("NutRenderer::loadFont(%s) there is no FRME chunk %d (offset %x)", filename, l, offset);
+			error("NutRenderer::loadFont(%s) there is no FRME chunk %d (offset %x)", filename, l, offset);
 			break;
 		}
 		offset += 8;
 		if (READ_BE_UINT32(dataSrc + offset) != 'FOBJ') {
-			warning("NutRenderer::loadFont(%s) there is no FOBJ chunk in FRME chunk %d (offset %x)", filename, l, offset);
+			error("NutRenderer::loadFont(%s) there is no FOBJ chunk in FRME chunk %d (offset %x)", filename, l, offset);
 			break;
 		}
 		int codec = READ_LE_UINT16(dataSrc + offset + 8);
@@ -144,7 +144,7 @@ bool NutRenderer::loadFont(const char *filename) {
 
 int NutRenderer::getCharWidth(byte c) const {
 	if (!_loaded) {
-		warning("NutRenderer::getCharWidth() Font is not loaded");
+		error("NutRenderer::getCharWidth() Font is not loaded");
 		return 0;
 	}
 
@@ -159,7 +159,7 @@ int NutRenderer::getCharWidth(byte c) const {
 
 int NutRenderer::getCharHeight(byte c) const {
 	if (!_loaded) {
-		warning("NutRenderer::getCharHeight() Font is not loaded");
+		error("NutRenderer::getCharHeight() Font is not loaded");
 		return 0;
 	}
 
@@ -174,7 +174,7 @@ int NutRenderer::getCharHeight(byte c) const {
 
 void NutRenderer::drawShadowChar(const Graphics::Surface &s, int c, int x, int y, byte color, bool showShadow) {
 	if (!_loaded) {
-		warning("NutRenderer::drawShadowChar() Font is not loaded");
+		error("NutRenderer::drawShadowChar() Font is not loaded");
 		return;
 	}
 
@@ -271,7 +271,7 @@ void NutRenderer::drawChar(const Graphics::Surface &s, byte c, int x, int y, byt
 
 void NutRenderer::draw2byte(const Graphics::Surface &s, int c, int x, int y, byte color) {
 	if (!_loaded) {
-		warning("NutRenderer::draw2byte() Font is not loaded");
+		error("NutRenderer::draw2byte() Font is not loaded");
 		return;
 	}
 
diff --git a/scumm/object.cpp b/scumm/object.cpp
index 31316e6002..8d0e08e875 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -240,7 +240,7 @@ void ScummEngine::getObjectXYPos(int object, int &x, int &y, int &dir) {
 			// FIXME: We used to assert here, but it seems that in the nexus
 			// in The Dig, this can happen, at least with old savegames, and
 			// it's safe to continue...
-			warning("getObjectXYPos: Can't find object %d", object);
+			debug(0, "getObjectXYPos: Can't find object %d", object);
 			return;
 		}
 		imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), ptr);
@@ -1400,7 +1400,7 @@ void ScummEngine::setObjectState(int obj, int state, int x, int y) {
 
 	i = getObjectIndex(obj);
 	if (i == -1) {
-		warning("setObjectState: no such object %d", obj);
+		debug(0, "setObjectState: no such object %d", obj);
 		return;
 	}
 
@@ -1462,7 +1462,7 @@ void ScummEngine::nukeFlObjects(int min, int max) {
 	ObjectData *od;
 	int i;
 
-	warning("nukeFlObjects(%d,%d)", min, max);
+	debug(0, "nukeFlObjects(%d,%d)", min, max);
 
 	for (i = (_numLocalObjects-1), od = _objs; --i >= 0; od++)
 		if (od->fl_object_index && od->obj_nr >= min && od->obj_nr <= max) {
@@ -1477,8 +1477,7 @@ void ScummEngine_v6::enqueueObject(int objectNumber, int objectX, int objectY, i
 	BlastObject *eo;
 
 	if (_blastObjectQueuePos >= (int)ARRAYSIZE(_blastObjectQueue)) {
-		warning("enqueueObject: overflow");
-		return;
+		error("enqueueObject: overflow");
 	}
 
 	int idx = getObjectIndex(objectNumber);
diff --git a/scumm/palette.cpp b/scumm/palette.cpp
index 8827add97e..21d3d0a106 100644
--- a/scumm/palette.cpp
+++ b/scumm/palette.cpp
@@ -440,7 +440,7 @@ void ScummEngine::palManipulateInit(int resID, int start, int end, int time) {
 	string2 = getStringAddress(resID + 1);
 	string3 = getStringAddress(resID + 2);
 	if (!string1 || !string2 || !string3) {
-		warning("palManipulateInit(%d,%d,%d,%d): Cannot obtain string resources %d, %d and %d",
+		error("palManipulateInit(%d,%d,%d,%d): Cannot obtain string resources %d, %d and %d",
 				resID, start, end, time, resID, resID + 1, resID + 2);
 		return;
 	}
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) {