diff options
| -rw-r--r-- | scumm/script_v2.cpp | 4 | ||||
| -rw-r--r-- | scumm/script_v5.cpp | 4 | ||||
| -rw-r--r-- | scumm/script_v8.cpp | 14 | ||||
| -rw-r--r-- | scumm/sound.cpp | 2 |
4 files changed, 11 insertions, 13 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 63f977725e..2b2834df2e 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -431,13 +431,13 @@ int ScummEngine_v2::readVar(uint var) { 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; diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 7de4f2d40d..a07bcf38c6 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -731,7 +731,7 @@ void ScummEngine_v5::o5_endCutscene() { 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 @@ void ScummEngine_v5::o5_startMusic() { // 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)); diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index f652bfa504..3cbfa30d68 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -392,7 +392,7 @@ int ScummEngine_v8::fetchScriptWordSigned() { } 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 @@ int ScummEngine_v8::readVar(uint var) { } 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 @@ void ScummEngine_v8::writeVar(uint var, int value) { 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_system() { 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 @@ void ScummEngine_v8::o8_kernelSetFunctions() { 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 @@ void ScummEngine_v8::o8_kernelGetFunctions() { 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 diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 5289fbc685..1770287002 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -272,7 +272,7 @@ void Sound::playSound(int soundID, int offset) { } // 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, |