[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.375,1.376 akos.cpp,1.231,1.232 charset.cpp,2.151,2.152 gfx.cpp,2.466,2.467 resource.cpp,1.331,1.332 resource_v3.cpp,1.41,1.42 resource_v7he.cpp,1.45,1.46 script_v100he.cpp,2.170,2.171 script_v2.cpp,2.281,2.282 script_v5.cpp,1.292,1.293 script_v6.cpp,1.448,1.449 script_v72he.cpp,2.302,2.303 script_v8.cpp,2.298,2.299 script_v90he.cpp,2.279,2.280 scumm.cpp,1.557,1.558 sound.cpp,1.472,1.473 string.cpp,1.299,1.300 wiz_he.cpp,2.92,2.93

kirben kirben at users.sourceforge.net
Sat Aug 13 18:43:01 CEST 2005


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

Modified Files:
	actor.cpp akos.cpp charset.cpp gfx.cpp resource.cpp 
	resource_v3.cpp resource_v7he.cpp script_v100he.cpp 
	script_v2.cpp script_v5.cpp script_v6.cpp script_v72he.cpp 
	script_v8.cpp script_v90he.cpp scumm.cpp sound.cpp string.cpp 
	wiz_he.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: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -d -r1.375 -r1.376
--- actor.cpp	30 Jul 2005 21:11:22 -0000	1.375
+++ actor.cpp	14 Aug 2005 01:41:52 -0000	1.376
@@ -1868,7 +1868,7 @@
 byte *Actor::getActorName() {
 	byte *ptr = _vm->getResourceAddress(rtActorName, _number);
 	if (ptr == NULL) {
-		warning("Failed to find name of actor %d", _number);
+		error("Failed to find name of actor %d", _number);
 	}
 	return ptr;
 }
@@ -1890,13 +1890,13 @@
 
 	akos = _vm->getResourceAddress(rtCostume, _costume);
 	if (!akos) {
-		warning("Can't remap actor %d, costume %d not found", _number, _costume);
+		debug(0, "Can't remap actor %d, costume %d not found", _number, _costume);
 		return;
 	}
 
 	akpl = _vm->findResourceData(MKID('AKPL'), akos);
 	if (!akpl) {
-		warning("Can't remap actor %d, costume %d doesn't contain an AKPL block", _number, _costume);
+		debug(0, "Can't remap actor %d, costume %d doesn't contain an AKPL block", _number, _costume);
 		return;
 	}
 
@@ -1928,13 +1928,13 @@
 
 	akos = _vm->getResourceAddress(rtCostume, _costume);
 	if (!akos) {
-		warning("Can't remap actor %d, costume %d not found", _number, _costume);
+		debug(0, "Can't remap actor %d, costume %d not found", _number, _costume);
 		return;
 	}
 
 	akpl = _vm->findResourceData(MKID('AKPL'), akos);
 	if (!akpl) {
-		warning("Can't remap actor %d, costume %d doesn't contain an AKPL block", _number, _costume);
+		debug(0, "Can't remap actor %d, costume %d doesn't contain an AKPL block", _number, _costume);
 		return;
 	}
 

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -r1.231 -r1.232
--- akos.cpp	30 Jul 2005 21:11:23 -0000	1.231
+++ akos.cpp	14 Aug 2005 01:41:52 -0000	1.232
@@ -551,7 +551,7 @@
 							if (pcolor == 13)
 								pcolor = _shadow_table[*dst];
 						} else if (_shadow_mode == 2) {
-							warning("codec1_spec2"); // TODO
+							error("codec1_spec2"); // TODO
 						} else if (_shadow_mode == 3) {
 							if (pcolor < 8) {
 								pcolor = (pcolor << 8) + *dst;
@@ -934,7 +934,7 @@
 	int32 maxw, maxh;
 
 	if (_actorHitMode) {
-		warning("codec5: _actorHitMode not yet implemented");
+		error("codec5: _actorHitMode not yet implemented");
 		return 0;
 	}
 
@@ -1101,7 +1101,7 @@
 	byte transparency = (_vm->_heversion >= 61) ? palette[0] : 255;
 
 	if (_actorHitMode) {
-		warning("codec16: _actorHitMode not yet implemented");
+		error("codec16: _actorHitMode not yet implemented");
 		return 0;
 	}
 

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.151
retrieving revision 2.152
diff -u -d -r2.151 -r2.152
--- charset.cpp	30 Jul 2005 21:11:23 -0000	2.151
+++ charset.cpp	14 Aug 2005 01:41:52 -0000	2.152
@@ -75,7 +75,7 @@
 			fp.read(_2byteFontPtr, ((_2byteWidth + 7) / 8) * _2byteHeight * numChar);
 			fp.close();
 		} else {
-			warning("Couldn't load any font");
+			error("Couldn't load any font");
 		}
 	}
 }
@@ -156,7 +156,7 @@
 		else if (kanjiType == EKANJI) chunk = 144;
 		break;
 	default:
-		warning("Invaild Char! f %x s %x base %x c %d p %d", f, s, base, c, p);
+		error("Invaild Char! f %x s %x base %x c %d p %d", f, s, base, c, p);
 		return 0;
 	}
 

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.466
retrieving revision 2.467
diff -u -d -r2.466 -r2.467
--- gfx.cpp	10 Aug 2005 22:13:55 -0000	2.466
+++ gfx.cpp	14 Aug 2005 01:41:52 -0000	2.467
@@ -1405,7 +1405,7 @@
 
 	bottom = y + height;
 	if (bottom > vs->h) {
-		warning("Gdi::drawBitmap, strip drawn to %d below window bottom %d", bottom, vs->h);
+		error("Gdi::drawBitmap, strip drawn to %d below window bottom %d", bottom, vs->h);
 	}
 
 	_vertStripNextInc = height * vs->pitch - 1;
@@ -1488,7 +1488,7 @@
 					offset = READ_LE_UINT32(smap_ptr + stripnr * 4 + 8);
 			}
 			if (offset < 0 || offset >= smapLen) {
-				warning("drawBitmap: Trying to draw a non-existant strip");
+				error("drawBitmap: Trying to draw a non-existant strip");
 				return;
 			}
 			useOrDecompress = decompressBitmap(dstPtr, vs->pitch, smap_ptr + offset, height);
@@ -1626,7 +1626,7 @@
 		break;
 	default:
 		// Alternayive russian freddi3 uses badly formatted bitmaps
-		warning("Gdi::drawBMAPBg: default case %d", code);
+		debug(0, "Gdi::drawBMAPBg: default case %d", code);
 	}
 
 	copyVirtScreenBuffers(Common::Rect(vs->w, vs->h));
@@ -2869,7 +2869,7 @@
 		dissolveEffect(1, virtscr[0].h);
 		break;
 	default:
-		warning("Unknown screen effect, %d", effect);
+		error("Unknown screen effect, %d", effect);
 	}
 	_screenEffectFlag = true;
 }
@@ -2921,7 +2921,7 @@
 			dissolveEffect(1, virtscr[0].h);
 			break;
 		default:
-			warning("fadeOut: default case %d", effect);
+			error("fadeOut: default case %d", effect);
 		}
 	}
 
@@ -3038,10 +3038,8 @@
 		h++;
 
 	offsets = (int *) malloc(w * h * sizeof(int));
-	if (offsets == NULL) {
-		warning("dissolveEffect: out of memory");
-		return;
-	}
+	if (offsets == NULL)
+		error("dissolveEffect: out of memory");
 
 	// Create a permutation of offsets into the frame buffer
 
@@ -3066,11 +3064,8 @@
 				offsets[i++] = y * vs->pitch + x;
 
 		offsets2 = (int *) malloc(w * h * sizeof(int));
-		if (offsets2 == NULL) {
-			warning("dissolveEffect: out of memory");
-			free(offsets);
-			return;
-		}
+		if (offsets2 == NULL)
+			error("dissolveEffect: out of memory");
 
 		memcpy(offsets2, offsets, w * h * sizeof(int));
 

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -d -r1.331 -r1.332
--- resource.cpp	30 Jul 2005 21:11:26 -0000	1.331
+++ resource.cpp	14 Aug 2005 01:41:52 -0000	1.332
@@ -430,7 +430,7 @@
 
 	case MKID('SVER'):
 		_fileHandle->seek(itemsize - 8, SEEK_CUR);
-		warning("SVER index block not yet handled, skipping");
+		debug(0, "SVER index block not yet handled, skipping");
 		break;
 
 	case MKID('INIB'):
@@ -568,7 +568,7 @@
 
 	/* for Humongous catalogs */
 	if (_heversion >= 70 && _numCharsets == 1) {
-		warning("not loading charset as it doesn't seem to exist?");
+		debug(0, "Not loading charset as it doesn't seem to exist?");
 		return;
 	}
 
@@ -819,7 +819,7 @@
 
 bool ResourceManager::validateResource(const char *str, int type, int idx) const {
 	if (type < rtFirst || type > rtLast || (uint) idx >= (uint)num[type]) {
-		warning("%s Illegal Glob type %s (%d) num %d", str, resTypeFromId(type), type, idx);
+		error("%s Illegal Glob type %s (%d) num %d", str, resTypeFromId(type), type, idx);
 		return false;
 	}
 	return true;

Index: resource_v3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v3.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- resource_v3.cpp	24 Jun 2005 16:14:37 -0000	1.41
+++ resource_v3.cpp	14 Aug 2005 01:41:52 -0000	1.42
@@ -65,7 +65,7 @@
 
 	magic = _fileHandle->readUint16LE();
 	if (magic != 0x0100)
-		warning("The magic id doesn't match (0x%X)", magic);
+		error("The magic id doesn't match (0x%X)", magic);
 
 	_numGlobalObjects = _fileHandle->readUint16LE();
 	_fileHandle->seek(_numGlobalObjects * 4, SEEK_CUR);

Index: resource_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v7he.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- resource_v7he.cpp	30 Jul 2005 21:11:27 -0000	1.45
+++ resource_v7he.cpp	14 Aug 2005 01:41:52 -0000	1.46
@@ -177,11 +177,11 @@
 
 	fi.total_size = fi.file->size();
 	if (fi.total_size == -1) {
-		warning("Cannot get size of file %s", fi.file->name());
+		error("Cannot get size of file %s", fi.file->name());
 		goto cleanup;
 	}
 	if (fi.total_size == 0) {
-		warning("%s: file has a size of 0", fi.file->name());
+		error("%s: file has a size of 0", fi.file->name());
 		goto cleanup;
 	}
 
@@ -266,7 +266,7 @@
 	*data = extract_resource(fi, wr, &size, &free_it, type_wr->id, (lang_wr == NULL ? NULL : lang_wr->id), _arg_raw);
 
 	if (data == NULL) {
-		warning("Win32ResExtractor::extract_resources() problem with resource extraction");
+		error("Win32ResExtractor::extract_resources() problem with resource extraction");
 		return 0;
 	}
 
@@ -362,7 +362,7 @@
 		snprintf(name, sizeof(name)/sizeof(char), "-%d", icondir->entries[c].res_id);
 		fwr = find_resource(fi, (is_icon ? "-3" : "-1"), name, lang, &level);
 		if (fwr == NULL) {
-			warning("%s: could not find `%s' in `%s' resource.",
+			error("%s: could not find `%s' in `%s' resource.",
 					fi->file->name(), &name[1], (is_icon ? "group_icon" : "group_cursor"));
 			return NULL;
 		}
@@ -410,7 +410,7 @@
 		snprintf(name, sizeof(name)/sizeof(char), "-%d", icondir->entries[c].res_id);
 		fwr = find_resource(fi, (is_icon ? "-3" : "-1"), name, lang, &level);
 		if (fwr == NULL) {
-			warning("%s: could not find `%s' in `%s' resource.",
+			error("%s: could not find `%s' in `%s' resource.",
 				fi->file->name(), &name[1], (is_icon ? "group_icon" : "group_cursor"));
 			return NULL;
 		}
@@ -471,7 +471,7 @@
 		need_size, total_size, (byte *)offset - memory, size);
 
 	if (need_size < 0 || need_size > total_size) {
-		warning("%s: premature end", name);
+		error("%s: premature end", name);
 		return false;
 	}
 
@@ -769,7 +769,7 @@
 
 		RETURN_IF_BAD_POINTER(false, mz_header->lfanew);
 		if (mz_header->lfanew < sizeof(DOSImageHeader)) {
-			warning("%s: not a Windows library", fi->file->name());
+			error("%s: not a Windows library", fi->file->name());
 			return false;
 		}
 	}
@@ -782,7 +782,7 @@
 		RETURN_IF_BAD_POINTER(false, header->rsrctab);
 		RETURN_IF_BAD_POINTER(false, header->restab);
 		if (header->rsrctab >= header->restab) {
-			warning("%s: no resource directory found", fi->file->name());
+			error("%s: no resource directory found", fi->file->name());
 			return false;
 		}
 
@@ -837,7 +837,7 @@
 		RETURN_IF_BAD_POINTER(false, pe_header->optional_header.data_directory[IMAGE_DIRECTORY_ENTRY_RESOURCE]);
 		dir = pe_header->optional_header.data_directory + IMAGE_DIRECTORY_ENTRY_RESOURCE;
 		if (dir->size == 0) {
-			warning("%s: file contains no resources", fi->file->name());
+			error("%s: file contains no resources", fi->file->name());
 			return false;
 		}
 
@@ -847,7 +847,7 @@
 	}
 
 	/* other (unknown) header signature was found */
-	warning("%s: not a Windows library", fi->file->name());
+	error("%s: not a Windows library", fi->file->name());
 	return false;
 }
 
@@ -949,11 +949,11 @@
 	fix_win32_cursor_icon_file_dir_endian(&dir);
 
 	if (dir.reserved != 0) {
-		warning("not an icon or cursor file (reserved non-zero)");
+		error("not an icon or cursor file (reserved non-zero)");
 		goto cleanup;
 	}
 	if (dir.type != 1 && dir.type != 2) {
-		warning("not an icon or cursor file (wrong type)");
+		error("not an icon or cursor file (wrong type)");
 		goto cleanup;
 	}
 
@@ -963,7 +963,7 @@
 			goto cleanup;
 		fix_win32_cursor_icon_file_dir_entry_endian(&entries[c]);
 		if (entries[c].reserved != 0)
-			warning("reserved is not zero");
+			error("reserved is not zero");
 	}
 
 	offset = sizeof(Win32CursorIconFileDir) + (dir.count - 1) * (sizeof(Win32CursorIconFileDirEntry));
@@ -987,24 +987,24 @@
 
 				fix_win32_bitmap_info_header_endian(&bitmap);
 				if (bitmap.size < sizeof(Win32BitmapInfoHeader)) {
-					warning("bitmap header is too short");
+					error("bitmap header is too short");
 					goto local_cleanup;
 				}
 				if (bitmap.compression != 0) {
-					warning("compressed image data not supported");
+					error("compressed image data not supported");
 					goto local_cleanup;
 				}
 				if (bitmap.x_pels_per_meter != 0)
-					warning("x_pels_per_meter field in bitmap should be zero");
+					error("x_pels_per_meter field in bitmap should be zero");
 				if (bitmap.y_pels_per_meter != 0)
-					warning("y_pels_per_meter field in bitmap should be zero");
+					error("y_pels_per_meter field in bitmap should be zero");
 				if (bitmap.clr_important != 0)
-					warning("clr_important field in bitmap should be zero");
+					error("clr_important field in bitmap should be zero");
 				if (bitmap.planes != 1)
-					warning("planes field in bitmap should be one");
+					error("planes field in bitmap should be one");
 				if (bitmap.size != sizeof(Win32BitmapInfoHeader)) {
 					uint32 skip = bitmap.size - sizeof(Win32BitmapInfoHeader);
-					warning("skipping %d bytes of extended bitmap header", skip);
+					error("skipping %d bytes of extended bitmap header", skip);
 					in->seek(skip, SEEK_CUR);
 				}
 				offset += bitmap.size;
@@ -1072,7 +1072,7 @@
 
 						if (bitmap.bit_count <= 16) {
 							if (color >= palette_count) {
-								warning("color out of range in image data");
+								error("color out of range in image data");
 								goto local_cleanup;
 							}
 							row[4*x+0] = palette[color].red;
@@ -1122,7 +1122,7 @@
 
 		if (previous == completed) {
 			if (min_offset < offset) {
-				warning("offset of bitmap header incorrect (too low)");
+				error("offset of bitmap header incorrect (too low)");
 				goto cleanup;
 			}
 			debugC(DEBUG_RESOURCE, "skipping %d bytes of garbage at %d", min_offset-offset, offset);

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.170
retrieving revision 2.171
diff -u -d -r2.170 -r2.171
--- script_v100he.cpp	30 Jul 2005 21:11:28 -0000	2.170
+++ script_v100he.cpp	14 Aug 2005 01:41:52 -0000	2.171
@@ -2138,7 +2138,7 @@
 		_userPut--;
 		break;
 	default:
-		warning("o100_cursorCommand: default case %x", subOp);
+		error("o100_cursorCommand: default case %x", subOp);
 	}
 
 	VAR(VAR_CURSORSTATE) = _cursor.state;
@@ -2441,7 +2441,7 @@
 		pop();
 		pop();
 		push(0);
-		warning("o100_getWizData() case 34 unhandled");
+		debug(0, "o100_getWizData() case 34 unhandled");
 		break;
 	case 64:
 		state = pop();
@@ -2466,7 +2466,7 @@
 		copyScriptString(filename, sizeof(filename));
 		pop();
 		push(0);
-		warning("o100_getWizData() case 111 unhandled");
+		debug(0, "o100_getWizData() case 111 unhandled");
 		break;
 	case 112:
 		h = pop();

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.281
retrieving revision 2.282
diff -u -d -r2.281 -r2.282
--- script_v2.cpp	6 Aug 2005 14:34:39 -0000	2.281
+++ script_v2.cpp	14 Aug 2005 01:41:52 -0000	2.282
@@ -718,7 +718,7 @@
 			a->_talkColor = arg;
 		break;
 	default:
-		warning("o2_actorOps: opcode %d not yet supported", _opcode);
+		error("o2_actorOps: opcode %d not yet supported", _opcode);
 	}
 }
 

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -d -r1.292 -r1.293
--- script_v5.cpp	6 Aug 2005 14:34:40 -0000	1.292
+++ script_v5.cpp	14 Aug 2005 01:41:52 -0000	1.293
@@ -530,7 +530,7 @@
 			a->_shadowMode = getVarOrDirectByte(PARAM_1);
 			break;
 		default:
-			warning("o5_actorOps: default case");
+			error("o5_actorOps: default case %d", _opcode & 0x1F);
 		}
 	}
 }
@@ -869,7 +869,7 @@
 	width = _charset->getStringWidth(0, ptr);
 
 	setResult(width);
-	warning("o5_getStringWidth, result %d", width);
+	debug(0, "o5_getStringWidth, result %d", width);
 }
 
 void ScummEngine_v5::o5_saveLoadVars() {
@@ -889,23 +889,23 @@
 			a = _resultVarNumber;
 			getResultPos();
 			b = _resultVarNumber;
-			warning("stub saveVars: vars %d -> %d", a, b);
+			debug(0, "stub saveVars: vars %d -> %d", a, b);
 			break;
 		case 0x02: // write a range of string variables
 			a = getVarOrDirectByte(PARAM_1);
 			b = getVarOrDirectByte(PARAM_2);
-			warning("stub saveVars: strings %d -> %d", a, b);
+			debug(0, "stub saveVars: strings %d -> %d", a, b);
 			break;
 		case 0x03: // open file
 			a = resStrLen(_scriptPointer);
-			warning("stub saveVars to %s", _scriptPointer);
+			debug(0, "stub saveVars to %s", _scriptPointer);
 			_scriptPointer += a + 1;
 			break;
 		case 0x04:
 			return;
 			break;
 		case 0x1F: // close file
-			warning("stub saveVars close file");
+			debug(0, "stub saveVars close file");
 			return;
 			break;
 		}
@@ -923,23 +923,23 @@
 			a = _resultVarNumber;
 			getResultPos();
 			b = _resultVarNumber;
-			warning("stub loadVars: vars %d -> %d", a, b);
+			debug(0, "stub loadVars: vars %d -> %d", a, b);
 			break;
 		case 0x02: // read a range of string variables
 			a = getVarOrDirectByte(0x80);
 			b = getVarOrDirectByte(0x40);
-			warning("stub loadVars: strings %d -> %d", a, b);
+			debug(0, "stub loadVars: strings %d -> %d", a, b);
 			break;
 		case 0x03: // open file
 			a = resStrLen(_scriptPointer);
-			warning("stub loadVars from %s", _scriptPointer);
+			debug(0, "stub loadVars from %s", _scriptPointer);
 			_scriptPointer += a + 1;
 			break;
 		case 0x04:
 			return;
 			break;
 		case 0x1F: // close file
-			warning("stub loadVars close file");
+			debug(0, "stub loadVars close file");
 			return;
 			break;
 		}
@@ -1740,7 +1740,7 @@
 	case 7:			// SO_NUKE_COSTUME
 	case 8:			// SO_NUKE_ROOM
 		if (_gameId == GID_ZAK256)
-			warning("o5_resourceRoutines %d should not occur in Zak256", op);
+			error("o5_resourceRoutines %d should not occur in Zak256", op);
 		else
 			res.setResourceCounter(resType[op-5], resid, 0x7F);
 		break;
@@ -1795,33 +1795,32 @@
 	// TODO: For the following see also Hibarnatus' information on bug #805691.
 	case 32:
 		// TODO (apparently never used in FM-TOWNS)
-		warning("o5_resourceRoutines %d not yet handled (script %d)", op,  vm.slot[_currentScript].number);
+		debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op,  vm.slot[_currentScript].number);
 		break;
 	case 33:
 		// TODO (apparently never used in FM-TOWNS)
-		warning("o5_resourceRoutines %d not yet handled (script %d)", op,  vm.slot[_currentScript].number);
+		debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op,  vm.slot[_currentScript].number);
 		break;
 	case 35:
 		// TODO: Might be used to set CD volume in FM-TOWNS Loom
 		foo = getVarOrDirectByte(PARAM_2);
-		warning("o5_resourceRoutines %d not yet handled (script %d)", op,  vm.slot[_currentScript].number);
+		debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op,  vm.slot[_currentScript].number);
 		break;
 	case 36:
 		// TODO: Sets the loudness of a sound resource. Used in Indy3 and Zak.
 		foo = getVarOrDirectByte(PARAM_2);
 		bar = fetchScriptByte();
-		warning("o5_resourceRoutines %d not yet handled (script %d)", op,  vm.slot[_currentScript].number);
+		debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op,  vm.slot[_currentScript].number);
 		break;
 	case 37:
 		// TODO: Sets the pitch of a sound resource (pitch = foo - center semitones.
 		// "center" is at 0x32 in the sfx resource (always 0x3C in zak256, but sometimes different in Indy3).
 		foo = getVarOrDirectByte(PARAM_2);
-		warning("o5_resourceRoutines %d not yet handled (script %d)", op,  vm.slot[_currentScript].number);
+		debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op,  vm.slot[_currentScript].number);
 		break;
 
 	default:
-		warning("Unknown o5_resourceRoutines: %d", op);
-		break;
+		error("o5_resourceRoutines: default case %d", op);
 	}
 }
 
@@ -1944,7 +1943,7 @@
 				case 20: // disable palette operations
 				case 21: // disable clearing of screen 0x1C:0x5000 sizeof(640 * 320) in initScreens()
 				case 22: // enable clearing of screen 0x1C:0x5000 sizeof(640 * 320) in initScreens()
-					warning("o5_roomOps: unhandled FM-TOWNS fadeEffect %d", a);
+					debug(0, "o5_roomOps: unhandled FM-TOWNS fadeEffect %d", a);
 					return;
 					break;
 				}
@@ -2178,7 +2177,7 @@
 	// far as I can tell, this is a script bug.
 
 	if (_gameId == GID_MONKEY2 && sound == 110 && _sound->isSoundRunning(151)) {
-		warning("Delaying Woodtick music until Largo's theme has finished");
+		printf("Delaying Woodtick music until Largo's theme has finished\n");
 		_scriptPointer = oldaddr;
 		o5_breakHere();
 		return;
@@ -2567,7 +2566,7 @@
 	int dist = fetchScriptByte();
 
 	if (nr == 106 && _gameId == GID_INDY4) {
-		warning("Bypassing Indy4 bug");
+		printf("Bypassing Indy4 bug\n");
 		return;
 	}
 
@@ -2723,7 +2722,7 @@
 						_sound->playCDTrack(1, 0, offset, delay);
 					}
 				} else {
-					warning("ScummEngine_v5::decodeParseString: Unhandled case 8");
+					error("ScummEngine_v5::decodeParseString: Unhandled case 8");
 				}
 			}
 			break;
@@ -2757,8 +2756,7 @@
 			}
 			return;
 		default:
-			warning("ScummEngine_v5::decodeParseString: Unhandled case %d", _opcode & 0xF);
-			return;
+			error("ScummEngine_v5::decodeParseString: Unhandled case %d", _opcode & 0xF);
 		}
 	}
 
@@ -2850,7 +2848,7 @@
 	if (whereIsObject(obj) == WIO_INVENTORY)	/* Don't take an */
 		return;											/* object twice */
 
-	// warning("adding %d from %d to inventoryOld", obj, _currentRoom);
+	// debug(0, "adding %d from %d to inventoryOld", obj, _currentRoom);
 	addObjectToInventory(obj, _roomResource);
 	markObjectRectAsDirty(obj);
 	putOwner(obj, VAR(VAR_EGO));

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -d -r1.448 -r1.449
--- script_v6.cpp	6 Aug 2005 14:34:40 -0000	1.448
+++ script_v6.cpp	14 Aug 2005 01:41:52 -0000	1.449
@@ -1185,7 +1185,7 @@
 			// FIXME: This is a hack to work around bug #742676 SAM: Fish Farm.
 			// Note quite sure why it happens, though, if it's normal or due to
 			// a bug in the ScummVM code.
-			warning("o6_walkActorToObj: invalid actor %d", obj);
+			debug(0, "o6_walkActorToObj: invalid actor %d", obj);
 			return;
 		}
 		if (!a->isInCurrentRoom() || !a2->isInCurrentRoom())
@@ -2555,7 +2555,7 @@
 			setupShadowPalette(0, args[1], args[2], args[3], args[4], args[5]);
 			break;
 		case 114:
-			warning("o6_kernelSetFunctions: stub114()");
+			error("o6_kernelSetFunctions: stub114()");
 			break;
 		case 117:
 			freezeScripts(2);
@@ -2611,7 +2611,7 @@
 		case 109:
 			// Case 108 and 109 share the same function
 			if (num != 6)
-				warning("o6_kernelSetFunctions sub op %d: expected 6 params but got %d", args[0], num);
+				error("o6_kernelSetFunctions sub op %d: expected 6 params but got %d", args[0], num);
 			setupShadowPalette(args[3], args[4], args[5], args[1], args[2], 0, 256);
 			break;
 		case 110:
@@ -2639,7 +2639,7 @@
 				// still be drawn in color.
 				setDirtyColors(0, 255);
 			} else
-				warning("stub o6_kernelSetFunctions_114()");
+				error("stub o6_kernelSetFunctions_114()");
 			break;
 		case 117:
 			// Sam & Max uses this opcode in script-43, right
@@ -2693,7 +2693,7 @@
 			VirtScreen *vs = &virtscr[0];
 			if (args[1] < 0 || args[1] >= vs->w || args[2] < 0 || args[2] >= vs->h) {
 				// FIXME: Until we know what to do in this case...
-				warning("o6_kernelGetFunctions:113: asking for pixel (%d, %d) outside of %dx%d screen", args[1], args[2], vs->w, vs->h);
+				debug(0, "o6_kernelGetFunctions:113: asking for pixel (%d, %d) outside of %dx%d screen", args[1], args[2], vs->w, vs->h);
 				push(0);
 			} else
 				push(*((byte *)vs->pixels + args[1] + args[2] * vs->pitch));
@@ -2953,7 +2953,7 @@
 	int i = 1;
 
 	if (room != _currentRoom)
-		warning("o6_findAllObjects: current room is not %d", room);
+		error("o6_findAllObjects: current room is not %d", room);
 	writeVar(0, 0);
 	defineArray(0, kIntArray, 0, _numLocalObjects + 1);
 	writeArray(0, 0, 0, _numLocalObjects);

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.302
retrieving revision 2.303
diff -u -d -r2.302 -r2.303
--- script_v72he.cpp	30 Jul 2005 21:11:29 -0000	2.302
+++ script_v72he.cpp	14 Aug 2005 01:41:52 -0000	2.303
@@ -2043,15 +2043,15 @@
 
 void ScummEngine_v72he::checkArrayLimits(int array, int dim2start, int dim2end, int dim1start, int dim1end) {
 	if (dim1end < dim1start) {
-		warning("Across max %d smaller than min %d", dim1end, dim1start);
+		error("Across max %d smaller than min %d", dim1end, dim1start);
  	}
  	if (dim2end < dim2start) {
-	 	warning("Down max %d smaller than min %d", dim2end, dim2start);
+	 	error("Down max %d smaller than min %d", dim2end, dim2start);
  	}
 	ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(array));
 	assert(ah);
 	if (ah->dim2start > dim2start || ah->dim2end < dim2end || ah->dim1start > dim1start || ah->dim1end < dim1end) {
-		warning("Invalid array access (%d,%d,%d,%d) limit (%d,%d,%d,%d)", dim2start, dim2end, dim1start, dim1end, ah->dim2start, ah->dim2end, ah->dim1start, ah->dim1end);
+		error("Invalid array access (%d,%d,%d,%d) limit (%d,%d,%d,%d)", dim2start, dim2end, dim1start, dim1end, ah->dim2start, ah->dim2end, ah->dim1start, ah->dim1end);
 	}
 }
 
@@ -2069,7 +2069,7 @@
 	int a22_num = a2_dim2end - a2_dim2start + 1;
 	int a21_num = a2_dim1end - a2_dim1start + 1;
 	if (a22_num != a12_num || a21_num != a11_num) {
-		warning("Operation size mismatch (%d vs %d)(%d vs %d)", a12_num, a22_num, a11_num, a21_num);
+		error("Operation size mismatch (%d vs %d)(%d vs %d)", a12_num, a22_num, a11_num, a21_num);
 	}
 
 	if (array1 != array2) {

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.298
retrieving revision 2.299
diff -u -d -r2.298 -r2.299
--- script_v8.cpp	30 Jul 2005 21:11:29 -0000	2.298
+++ script_v8.cpp	14 Aug 2005 01:41:52 -0000	2.299
@@ -508,7 +508,7 @@
 
 		break;
 	case 0xD2:		// SO_PRINT_WRAP Set print wordwrap
-		//warning("decodeParseString: SO_PRINT_WRAP");
+		//debug(0, "decodeParseString: SO_PRINT_WRAP");
 		break;
 	default:
 		error("decodeParseString: default case 0x%x", b);
@@ -1051,10 +1051,10 @@
 	byte subOp = fetchScriptByte();
 	switch (subOp) {
 	case 0x32:		// SO_CAMERA_PAUSE
-		//warning("freezeCamera NYI");
+		//debug(0, "freezeCamera NYI");
 		break;
 	case 0x33:		// SO_CAMERA_RESUME
-		//warning("unfreezeCamera NYI");
+		//debug(0, "unfreezeCamera NYI");
 		break;
 	default:
 		error("o8_cameraOps: default case 0x%x", subOp);
@@ -1170,7 +1170,7 @@
 		// scripts that place verbs for that.
 		// Also, var595 contains the vertical position at which to start placing verbs (330)
 		a = pop();
-		warning("SO_VERB_LINE_SPACING %d: not yet implemented", a);
+		debug(0, "SO_VERB_LINE_SPACING %d: not yet implemented", a);
 		break;
 	default:
 		error("o8_verbops: default case 0x%x", subOp);
@@ -1239,7 +1239,7 @@
 		setScaleSlot(args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
 		break;
 	case 22:	// setBannerColors
-//		warning("o8_kernelSetFunctions: setBannerColors(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]);
+//		debug(0, "o8_kernelSetFunctions: setBannerColors(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]);
 		break;
 	case 23:	// setActorChoreLimbFrame
 		a = derefActor(args[1], "o8_kernelSetFunctions:setActorChoreLimbFrame");
@@ -1255,7 +1255,7 @@
 		char name[30];
 
 		if (!address) {
-			warning("o8_kernelSetFunctions: saveGameReadName failed finding slot string %d", args[2]);
+			error("o8_kernelSetFunctions: saveGameReadName failed finding slot string %d", args[2]);
 			break;
 		}
 		getSavegameName(args[1] - 1, name);
@@ -1266,7 +1266,7 @@
 	case 26: {	// saveGame?
 		//char *address = (char*)getStringAddress(args[2]);
 		char address[30];
-		warning("o8_kernelSetFunctions: saveGame?(%d, %s)", args[1], address);
+		debug(0, "o8_kernelSetFunctions: saveGame?(%d, %s)", args[1], address);
 		break;
 	}
 	case 27: {	// FIXME: This doesn't work
@@ -1274,22 +1274,21 @@
 		_saveLoadSlot = args[1];
 		_saveLoadFlag = 2;
 		_saveTemporaryState = false;
-		warning("Sgl: %d", args[1]);
+		debug(0, "Sgl: %d", args[1]);
 		break;
 	}
 	case 28:	// saveGameStampScreenshot
-		warning("o8_kernelSetFunctions: saveGameStampScreenshot(%d, %d, %d, %d, %d, %d)", args[1], args[2], args[3], args[4], args[5], args[6]);
+		debug(0, "o8_kernelSetFunctions: saveGameStampScreenshot(%d, %d, %d, %d, %d, %d)", args[1], args[2], args[3], args[4], args[5], args[6]);
 		break;
 	case 29:	// setKeyScript
 		_keyScriptKey = args[1];
 		_keyScriptNo = args[2];
 		break;
 	case 30:	// killAllScriptsButMe
-		warning("o8_kernelSetFunctions: killAllScriptsButMe()");
 		killAllScriptsExceptCurrent();
 		break;
 	case 31:	// stopAllVideo
-		warning("o8_kernelSetFunctions: stopAllVideo()");
+		debug(0, "o8_kernelSetFunctions: stopAllVideo()");
 		break;
 	case 32:	// writeRegistryValue
 		{
@@ -1301,7 +1300,7 @@
 		}
 		break;
 	case 33:	// paletteSetIntensity
-		warning("o8_kernelSetFunctions: paletteSetIntensity(%d, %d)", args[1], args[2]);
+		debug(0, "o8_kernelSetFunctions: paletteSetIntensity(%d, %d)", args[1], args[2]);
 		break;
 	case 34:	// queryQuit
 		if (_confirmExit)
@@ -1323,7 +1322,7 @@
 		break;
 
 	default:
-		warning("o8_kernelSetFunctions: default case 0x%x (len = %d)", args[0], len);
+		error("o8_kernelSetFunctions: default case 0x%x (len = %d)", args[0], len);
 	}
 }
 

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.279
retrieving revision 2.280
diff -u -d -r2.279 -r2.280
--- script_v90he.cpp	6 Aug 2005 14:34:40 -0000	2.279
+++ script_v90he.cpp	14 Aug 2005 01:41:52 -0000	2.280
@@ -1753,7 +1753,7 @@
 		copyScriptString(filename, sizeof(filename));
 		pop();
 		push(0);
-		warning("o90_getWizData() case 111 unhandled");
+		debug(0, "o90_getWizData() case 111 unhandled");
 		break;
 	default:
 		error("o90_getWizData: Unknown case %d", subOp);

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -d -r1.557 -r1.558
--- scumm.cpp	4 Aug 2005 10:19:52 -0000	1.557
+++ scumm.cpp	14 Aug 2005 01:41:52 -0000	1.558
@@ -1163,7 +1163,7 @@
 	_copyProtection = ConfMan.getBool("copy_protection");
 	_demoMode = ConfMan.getBool("demo_mode");
 	if (ConfMan.hasKey("nosubtitles")) {
-		warning("Configuration key 'nosubtitles' is deprecated. Use 'subtitles' instead");
+		printf("Configuration key 'nosubtitles' is deprecated. Use 'subtitles' instead\n");
 		if (!ConfMan.hasKey("subtitles"))
 			ConfMan.set("subtitles", !ConfMan.getBool("nosubtitles"));
 	}
@@ -1926,12 +1926,12 @@
 	/* Bind the mixer to the system => mixer will be invoked
 	 * automatically when samples need to be generated */
 	if (!_mixer->isReady()) {
-		warning("Sound mixer initialization failed");
+		printf("Sound mixer initialization failed\n");
 		if (_midiDriver == MD_ADLIB ||
 				_midiDriver == MD_PCSPK ||
 				_midiDriver == MD_PCJR)	{
 			_midiDriver = MD_NULL;
-			warning("MIDI driver depends on sound mixer, switching to null MIDI driver");
+			printf("MIDI driver depends on sound mixer, switching to null MIDI driver\n");
 		}
 	}
 
@@ -2439,7 +2439,7 @@
 }
 
 void ScummEngine::startManiac() {
-	warning("stub startManiac()");
+	debug(0, "stub startManiac()");
 	displayMessage(0, "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' directory inside the Tentacle game directory.");
 }
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -d -r1.472 -r1.473
--- sound.cpp	10 Aug 2005 12:42:56 -0000	1.472
+++ sound.cpp	14 Aug 2005 01:41:52 -0000	1.473
@@ -146,7 +146,7 @@
 	while (i < _soundQuePos) {
 		num = _soundQue[i++];
 		if (i + num > _soundQuePos) {
-			warning("processSoundQues: invalid num value");
+			error("processSoundQues: invalid num value");
 			break;
 		}
 		memset(data, 0, sizeof(data));
@@ -335,7 +335,7 @@
 		size = READ_BE_UINT32(ptr+4) - 8;
 		if (heOffset < 0 || heOffset > size) {
 			// Occurs when making fireworks in puttmoon
-			warning("playSound: Invalid sound offset (%d) in sound %d", heOffset, soundID);
+			debug(0, "playSound: Invalid sound offset (%d) in sound %d", heOffset, soundID);
 			heOffset = 0;
 		}
 		size -= heOffset;
@@ -662,7 +662,7 @@
 	int32 size;
 
 	if (!_sfxFile->isOpen()) {
-		warning("startHETalkSound: Speech file is not open");
+		error("startHETalkSound: Speech file is not open");
 		return;
 	}
 
@@ -1452,7 +1452,7 @@
 			_fileHandle->read(res.createResource(type, idx, total_size), total_size);
 			return 1;
 		}
-		warning("Unrecognized base tag 0x%08x in sound %d", basetag, idx);
+		error("Unrecognized base tag 0x%08x in sound %d", basetag, idx);
 	}
 	res.roomoffs[type][idx] = 0xFFFFFFFF;
 	return 0;
@@ -1900,7 +1900,7 @@
 				continue;
 
 			if (instr[i*16 + 13])
-				warning("Sound %d instrument %d uses percussion", idx, i);
+				debugC(DEBUG_SOUND, "Sound %d instrument %d uses percussion", idx, i);
 
 			debugC(DEBUG_SOUND, "Sound %d: instrument %d on channel %d.", idx, i, ch);
 

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -d -r1.299 -r1.300
--- string.cpp	30 Jul 2005 21:11:31 -0000	1.299
+++ string.cpp	14 Aug 2005 01:41:52 -0000	1.300
@@ -303,7 +303,7 @@
 				_keepText = false;
 				break;
 			default:
-				warning("CHARSET_1: invalid code %d", c);
+				error("CHARSET_1: invalid code %d", c);
 			}
 		} else if (c == 0xFE || c == 0xFF) {
 			// WORKAROUND to avoid korean code 0xfe treated as charset message code.
@@ -369,7 +369,7 @@
 					_charset->setColor(color);
 				break;
 			case 13:
-				warning("CHARSET_1: Unknown opcode 13 %d", READ_LE_UINT16(buffer));
+				debug(0, "CHARSET_1: Unknown opcode 13 %d", READ_LE_UINT16(buffer));
 				buffer += 2;
 				break;
 			case 14: {
@@ -383,7 +383,7 @@
 				break;
 				}
 			default:
-				warning("CHARSET_1: invalid code %d", c);
+				error("CHARSET_1: invalid code %d", c);
 			}
 		} else {
 loc_avoid_ks_fe:
@@ -552,7 +552,7 @@
 				// A better name for _blitAlso might be _imprintOnBackground
 
 				if (_string[a].no_talk_anim == false) {
-					//warning("Would have set _charset->_blitAlso = true (wanted to print '%c' = %d)", c, c);
+					//debug(0, "Would have set _charset->_blitAlso = true (wanted to print '%c' = %d)", c, c);
 					_charset->_blitAlso = true;
 				}
 			}
@@ -599,7 +599,7 @@
 	end = dst + dstSize;
 
 	if (msg == NULL) {
-		warning("Bad message in convertMessageToString, ignoring");
+		debug(0, "Bad message in convertMessageToString, ignoring");
 		return 0;
 	}
 
@@ -671,8 +671,7 @@
 					}
 					break;
 				default:
-					warning("convertMessageToString(): string escape sequence %d unknown", chr);
-					break;
+					error("convertMessageToString(): string escape sequence %d unknown", chr);
 				}
 				num += (_version == 8) ? 4 : 2;
 			}

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.92
retrieving revision 2.93
diff -u -d -r2.92 -r2.93
--- wiz_he.cpp	30 Jul 2005 21:11:32 -0000	2.92
+++ wiz_he.cpp	14 Aug 2005 01:41:52 -0000	2.93
@@ -1083,10 +1083,10 @@
 		// TODO Adding masking for flags 0x80 and 0x100
 		if (flags & 0x80) {
 			// Used in maze
-			warning("drawWizImage: Unhandled flag 0x80");
+			debug(0, "drawWizImage: Unhandled flag 0x80");
 		} else if (flags & 0x100) {
 			// Used in readdemo
-			warning("drawWizImage: Unhandled flag 0x100");
+			debug(0, "drawWizImage: Unhandled flag 0x100");
 		}
 		copyWizImage(dst, wizd, cw, ch, x1, y1, width, height, &rScreen, palPtr);
 		break;
@@ -1095,7 +1095,7 @@
 		break;
 	case 5:
 		// Used in Moonbase Commander
-		warning("drawWizImage: Unhandled wiz compression type %d", comp);
+		debug(0, "drawWizImage: Unhandled wiz compression type %d", comp);
 		break;
 	default:
 		error("drawWizImage: Unhandled wiz compression type %d", comp);
@@ -1407,7 +1407,7 @@
 	int sourceImage = 0;
 	if (params->processFlags & kWPFMaskImg) {
 		sourceImage = params->sourceImage;
-		warning("displayWizComplexImage() unhandled flag 0x80000");
+		debug(0, "displayWizComplexImage() unhandled flag 0x80000");
 	}
 	int palette = 0;
 	if (params->processFlags & kWPFPaletteNum) {
@@ -1442,7 +1442,7 @@
 	int field_390 = 0;
 	if (params->processFlags & 0x200000) {
 		field_390 = params->img.field_390;
-		warning("displayWizComplexImage() unhandled flag 0x200000");
+		debug(0, "displayWizComplexImage() unhandled flag 0x200000");
 	}
 	const Common::Rect *r = NULL;
 	if (params->processFlags & kWPFClipBox) {
@@ -1731,7 +1731,7 @@
 					byte *p = _vm->res.createResource(rtImage, params->img.resNum, size);
 					if (f.read(p, size) != size) {
 						_vm->res.nukeResource(rtImage, params->img.resNum);
-						warning("i/o error when reading '%s'", buf);
+						error("i/o error when reading '%s'", buf);
 						_vm->VAR(_vm->VAR_GAME_LOADED) = -2;
 						_vm->VAR(119) = -2;
 					} else {
@@ -1747,7 +1747,7 @@
 			} else {
 				_vm->VAR(_vm->VAR_GAME_LOADED) = -3;
 				_vm->VAR(119) = -3;
-				warning("Unable to open for read '%s'", buf);
+				debug(0, "Unable to open for read '%s'", buf);
 			}
 		}
 		break;
@@ -1771,13 +1771,13 @@
 				}
 
 				if (!f.open((const char *)buf, Common::File::kFileWriteMode)) {
-					warning("Unable to open for write '%s'", buf);
+					debug(0, "Unable to open for write '%s'", buf);
 					_vm->VAR(119) = -3;
 				} else {
 					byte *p = _vm->getResourceAddress(rtImage, params->img.resNum);
 					uint32 size = READ_BE_UINT32(p + 4);
 					if (f.write(p, size) != size) {
-						warning("i/o error when writing '%s'", params->filename);
+						error("i/o error when writing '%s'", params->filename);
 						_vm->VAR(119) = -2;
 					} else {
 						_vm->VAR(119) = 0;
@@ -1900,12 +1900,12 @@
 			break;
 		case 2:
 			// Used baseball2003
-			warning("isWizPixelNonTransparent: Unhandled wiz compression type %d", c);
+			debug(0, "isWizPixelNonTransparent: Unhandled wiz compression type %d", c);
 			break;
 		case 4:
 		case 5:
 			// Used in Moonbase Commander
-			warning("isWizPixelNonTransparent: Unhandled wiz compression type %d", c);
+			debug(0, "isWizPixelNonTransparent: Unhandled wiz compression type %d", c);
 			break;
 		default:
 			error("isWizPixelNonTransparent: Unhandled wiz compression type %d", c);
@@ -1937,7 +1937,7 @@
 	case 5:
 		// Used in Moonbase Commander
 		color = 1;
-		warning("getWizPixelColor: Unhandled wiz compression type %d", c);
+		debug(0, "getWizPixelColor: Unhandled wiz compression type %d", c);
 		break;
 	default:
 		error("getWizPixelColor: Unhandled wiz compression type %d", c);





More information about the Scummvm-git-logs mailing list