[Scummvm-cvs-logs] CVS: scummvm/scumm boxes.cpp,1.91,1.92 cursor.cpp,2.47,2.48 imuse.cpp,2.146,2.147 imuse_player.cpp,2.55,2.56 logic_he.cpp,2.25,2.26 midiparser_eup.cpp,1.17,1.18 midiparser_ro.cpp,1.9,1.10 nut_renderer.cpp,1.63,1.64 object.cpp,1.247,1.248 palette.cpp,2.53,2.54

kirben kirben at users.sourceforge.net
Sat Aug 13 19:05:14 CEST 2005 

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12353/scumm

Modified Files:
	boxes.cpp cursor.cpp imuse.cpp imuse_player.cpp logic_he.cpp 
	midiparser_eup.cpp midiparser_ro.cpp nut_renderer.cpp 
	object.cpp palette.cpp 
Log Message:

Replace warnings with debug, errors or printfs:
-To catch any missing cases/functions used.
-To prevent users reporting warnings as bugs


Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- boxes.cpp	30 Jul 2005 21:11:23 -0000	1.91
+++ boxes.cpp	14 Aug 2005 02:04:26 -0000	1.92
@@ -761,7 +761,7 @@
 	}
 
 	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;
 }

Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/cursor.cpp,v
retrieving revision 2.47
retrieving revision 2.48
diff -u -d -r2.47 -r2.48
--- cursor.cpp	30 Jul 2005 21:11:23 -0000	2.47
+++ cursor.cpp	14 Aug 2005 02:04:26 -0000	2.48
@@ -142,7 +142,7 @@
 	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 @@
 	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 @@
 	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);

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.146
retrieving revision 2.147
diff -u -d -r2.146 -r2.147
--- imuse.cpp	30 Jul 2005 21:11:25 -0000	2.146
+++ imuse.cpp	14 Aug 2005 02:04:26 -0000	2.147
@@ -145,7 +145,7 @@
 	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 @@
 	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 @@
 		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 @@
 			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 @@
 				// 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 @@
 			}
 			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 @@
 		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 @@
 		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 @@
 	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::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);

Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.55
retrieving revision 2.56
diff -u -d -r2.55 -r2.56
--- imuse_player.cpp	24 Jun 2005 16:14:37 -0000	2.55
+++ imuse_player.cpp	14 Aug 2005 02:04:26 -0000	2.56
@@ -98,7 +98,7 @@
 	// 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 @@
 			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 @@
 
 	default:
 		if (!_scanning) {
-			warning("Player::send(): Invalid command %d", cmd);
+			error("Player::send(): Invalid command %d", cmd);
 			clear();
 		}
 	}
@@ -370,7 +370,7 @@
 			// 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 @@
 		break;
 
 	default:
-		warning("Unknown SysEx command %d", (int)code);
+		error("Unknown SysEx command %d", (int)code);
 	}
 }
 
@@ -773,7 +773,7 @@
 
 	part = _se->allocate_part(_priority, _midi);
 	if (!part) {
-		warning("no parts available");
+		error("no parts available");
 		return NULL;
 	}
 
@@ -1016,7 +1016,7 @@
 	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 @@
 		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 @@
 			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;
 	}
 

Index: logic_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/logic_he.cpp,v
retrieving revision 2.25
retrieving revision 2.26
diff -u -d -r2.25 -r2.26
--- logic_he.cpp	8 Aug 2005 12:58:56 -0000	2.25
+++ logic_he.cpp	14 Aug 2005 02:04:26 -0000	2.26
@@ -618,10 +618,7 @@
 
 	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;

Index: midiparser_eup.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/midiparser_eup.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- midiparser_eup.cpp	24 Jun 2005 16:14:37 -0000	1.17
+++ midiparser_eup.cpp	14 Aug 2005 02:04:26 -0000	1.18
@@ -148,7 +148,7 @@
 				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 @@
 	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;
 	}
 

Index: midiparser_ro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/midiparser_ro.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- midiparser_ro.cpp	24 Jun 2005 16:14:37 -0000	1.9
+++ midiparser_ro.cpp	14 Aug 2005 02:04:26 -0000	1.10
@@ -119,7 +119,7 @@
 	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;
 	}
 

Index: nut_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/nut_renderer.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- nut_renderer.cpp	30 Jul 2005 21:11:26 -0000	1.63
+++ nut_renderer.cpp	14 Aug 2005 02:04:26 -0000	1.64
@@ -70,19 +70,19 @@
 
 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 @@
 	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 @@
 	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 @@
 
 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::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 @@
 
 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::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;
 	}
 

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- object.cpp	30 Jul 2005 21:11:26 -0000	1.247
+++ object.cpp	14 Aug 2005 02:04:26 -0000	1.248
@@ -240,7 +240,7 @@
 			// 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 @@
 
 	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 @@
 	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 @@
 	BlastObject *eo;
 
 	if (_blastObjectQueuePos >= (int)ARRAYSIZE(_blastObjectQueue)) {
-		warning("enqueueObject: overflow");
-		return;
+		error("enqueueObject: overflow");
 	}
 
 	int idx = getObjectIndex(objectNumber);

Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette.cpp,v
retrieving revision 2.53
retrieving revision 2.54
diff -u -d -r2.53 -r2.54
--- palette.cpp	30 Jul 2005 21:11:26 -0000	2.53
+++ palette.cpp	14 Aug 2005 02:04:26 -0000	2.54
@@ -440,7 +440,7 @@
 	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;
 	}

More information about the Scummvm-git-logs mailing list