diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/imuse/imuse.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/imuse/imuse_player.cpp | 13 |
2 files changed, 4 insertions, 13 deletions
diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp index ba17867905..1d83b105c6 100644 --- a/engines/scumm/imuse/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -711,15 +711,13 @@ int32 IMuseInternal::doCommand(int numargs, int a[]) { if (!_initialized && (cmd || param)) return -1; -#ifdef IMUSE_DEBUG { char string[128]; sprintf(string, "doCommand - %d (%d/%d)", a[0], (int)param, (int)cmd); for (i = 1; i < numargs; ++i) sprintf(string + strlen(string), ", %d", a[i]); - debug(0, string); + debugC(DEBUG_IMUSE, string); } -#endif if (param == 0) { switch (cmd) { diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp index 59cb998021..b73eb2a3bf 100644 --- a/engines/scumm/imuse/imuse_player.cpp +++ b/engines/scumm/imuse/imuse_player.cpp @@ -129,9 +129,7 @@ bool Player::startSound(int sound, MidiDriver *midi, bool passThrough) { return false; } -#ifdef IMUSE_DEBUG - debug(0, "Starting music %d", sound); -#endif + debugC(DEBUG_IMUSE, "Starting music %d", sound); return true; } @@ -153,10 +151,7 @@ bool Player::isFadingOut() const { void Player::clear() { if (!_active) return; - -#ifdef IMUSE_DEBUG - debug(0, "Stopping music %d", _id); -#endif + debugC(DEBUG_IMUSE, "Stopping music %d", _id); if (_parser) { _parser->unloadMusic(); @@ -386,7 +381,6 @@ void Player::sysEx(byte *p, uint16 len) { if (len >= sizeof(buf) * 2) return; -#ifdef IMUSE_DEBUG if (!_scanning) { for (a = 0; a < len + 1 && a < 19; ++a) { sprintf((char *)&buf[a*3], " %02X", p[a]); @@ -396,9 +390,8 @@ void Player::sysEx(byte *p, uint16 len) { ++a; } // end if buf[a*3] = '\0'; - debug(0, "[%02d] SysEx:%s", _id, buf); + debugC(DEBUG_IMUSE, "[%02d] SysEx:%s", _id, buf); } -#endif switch (code = *p++) { case 0: |