[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.250,2.251 script_v5.cpp,1.256,1.257 script_v8.cpp,2.267,2.268 sound.cpp,1.364,1.365

[Travis Howell]

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

Modified Files:
	script_v2.cpp script_v5.cpp script_v8.cpp sound.cpp 
Log Message:

Switch to debug channel


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.250
retrieving revision 2.251
diff -u -d -r2.250 -r2.251
--- script_v2.cpp	21 Aug 2004 22:33:22 -0000	2.250
+++ script_v2.cpp	22 Aug 2004 09:30:08 -0000	2.251
@@ -431,13 +431,13 @@
 		var = _scummVars[var];
 
 	checkRange(_numVariables - 1, 0, var, "Variable %d out of range(r)");
-	debug(6, "readvar(%d) = %d", var, _scummVars[var]);
+	debugC(DEBUG_VARS, "readvar(%d) = %d", var, _scummVars[var]);
 	return _scummVars[var];
 }
 
 void ScummEngine_v2::writeVar(uint var, int value) {
 	checkRange(_numVariables - 1, 0, var, "Variable %d out of range(r)");
-	debug(6, "writeVar(%d) = %d", var, value);
+	debugC(DEBUG_VARS, "writeVar(%d) = %d", var, value);
 
 	_scummVars[var] = value;
 

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -r1.256 -r1.257
--- script_v5.cpp	21 Aug 2004 22:33:23 -0000	1.256
+++ script_v5.cpp	22 Aug 2004 09:30:08 -0000	1.257
@@ -731,7 +731,7 @@
 
 void ScummEngine_v5::o5_debug() {
 	int a = getVarOrDirectWord(PARAM_1);
-	debug(1, "o5_debug(%d)", a);
+	debugC(DEBUG_GENERAL, "o5_debug(%d)", a);
 }
 
 void ScummEngine_v5::o5_decrement() {
@@ -2127,7 +2127,7 @@
 			// can look at the global script #9 (0x888A in 49.LFL). 
 			break;
 		}
-		debug(4,"o5_startMusic(%d)", b);
+		debugC(DEBUG_GENERAL,"o5_startMusic(%d)", b);
 		setResult(result);
 	} else {
 		_sound->addSoundToQueue(getVarOrDirectByte(PARAM_1));

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.267
retrieving revision 2.268
diff -u -d -r2.267 -r2.268
--- script_v8.cpp	21 Aug 2004 22:33:23 -0000	2.267
+++ script_v8.cpp	22 Aug 2004 09:30:08 -0000	2.268
@@ -392,7 +392,7 @@
 }
 
 int ScummEngine_v8::readVar(uint var) {
-	debug(9, "readvar(%d)", var);
+	debugC(DEBUG_VARS, "readvar(%d)", var);
 
 	if (!(var & 0xF0000000)) {
 		checkRange(_numVariables - 1, 0, var, "Variable %d out of range(r)");
@@ -416,7 +416,7 @@
 }
 
 void ScummEngine_v8::writeVar(uint var, int value) {
-	debug(9, "writeVar(%d, %d)", var, value);
+	debugC(DEBUG_VARS, "writeVar(%d, %d)", var, value);
 
 	if (!(var & 0xF0000000)) {
 		checkRange(_numVariables - 1, 0, var, "Variable %d out of range(w)");
@@ -430,9 +430,9 @@
 
 		if ((_varwatch == (int)var) || (_varwatch == 0)) {
 			if (vm.slot[_currentScript].number < 100)
-				debug(1, "vars[%d] = %d (via script-%d)", var, value, vm.slot[_currentScript].number);
+				debugC(DEBUG_VARS, "vars[%d] = %d (via script-%d)", var, value, vm.slot[_currentScript].number);
 			else
-				debug(1, "vars[%d] = %d (via room-%d-%d)", var, value, _currentRoom, vm.slot[_currentScript].number);
+				debugC(DEBUG_VARS, "vars[%d] = %d (via room-%d-%d)", var, value, _currentRoom, vm.slot[_currentScript].number);
 		}
 		return;
 	}
@@ -1212,8 +1212,6 @@
 void ScummEngine_v8::o8_startVideo() {
 	int len = resStrLen(_scriptPointer);
 
-	debug(4, "o8_startVideo(%s)", (const char*)_scriptPointer);
-
 	SmushPlayer *sp = new SmushPlayer(this, 1000000 / 12);
 	sp->play((const char*)_scriptPointer);
 	delete sp;
@@ -1336,7 +1334,7 @@
 		array = 658;
 		ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(array));
 
-		debug(1,"o8_kernelSetFunctions: writeRegistryValue(%s, %d)", (char *)ah->data, value);
+		debugC(DEBUG_GENERAL,"o8_kernelSetFunctions: writeRegistryValue(%s, %d)", (char *)ah->data, value);
 		}
 		break;
 	case 33:	// paletteSetIntensity
@@ -1463,7 +1461,7 @@
 			push(14);
 		else 		// Use defaults
 			push(-1);
-		debug(1,"o8_kernelGetFunctions: readRegistryValue(%s)", (char *)ah->data);
+		debugC(DEBUG_GENERAL,"o8_kernelGetFunctions: readRegistryValue(%s)", (char *)ah->data);
 		}
 		break;
 	case 0xE1:		// imGetMusicPosition

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -d -r1.364 -r1.365
--- sound.cpp	21 Aug 2004 22:33:23 -0000	1.364
+++ sound.cpp	22 Aug 2004 09:30:08 -0000	1.365
@@ -272,7 +272,7 @@
 	}	
 	// Support for sampled sound effects in Monkey Island 1 and 2
 	else if (READ_UINT32(ptr) == MKID('SBL ')) {
-		debug(2, "Using SBL sound effect");
+		debugC(DEBUG_SOUND, "Using SBL sound effect");
 		
 		// SBL resources essentially contain VOC sound data.
 		// There are at least two main variants: in one,