diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/groovie/script.cpp | 6 | ||||
| -rw-r--r-- | engines/groovie/vdx.cpp | 7 | ||||
| -rw-r--r-- | engines/scumm/debugger.cpp | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp index e1912d2737..4909bb46bc 100644 --- a/engines/groovie/script.cpp +++ b/engines/groovie/script.cpp @@ -42,7 +42,8 @@ void debugScript(int level, bool nl, const char *s, ...) { char buf[STRINGBUFLEN]; va_list va; - if (!Common::isSpecialDebugLevelEnabled(kGroovieDebugScript | kGroovieDebugAll)) + if (!Common::isSpecialDebugLevelEnabled(kGroovieDebugScript) && + !Common::isSpecialDebugLevelEnabled(kGroovieDebugAll)) return; va_start(va, s); @@ -329,7 +330,8 @@ bool Script::hotspot(Common::Rect rect, uint16 address, uint8 cursor) { bool contained = rect.contains(mousepos); // Show hotspots when debugging - if (Common::getEnabledSpecialDebugLevels() & (kGroovieDebugHotspots | kGroovieDebugAll)) { + if (Common::isSpecialDebugLevelEnabled(kGroovieDebugHotspots) || + Common::isSpecialDebugLevelEnabled(kGroovieDebugAll)) { rect.translate(0, -80); _vm->_graphicsMan->_foreground.frameRect(rect, 250); _vm->_system->copyRectToScreen((byte*)_vm->_graphicsMan->_foreground.getBasePtr(0, 0), 640, 0, 80, 640, 320); diff --git a/engines/groovie/vdx.cpp b/engines/groovie/vdx.cpp index aa5196c5c9..2e5cb2dbe9 100644 --- a/engines/groovie/vdx.cpp +++ b/engines/groovie/vdx.cpp @@ -49,7 +49,8 @@ void VDXPlayer::setOrigin(int16 x, int16 y) { } uint16 VDXPlayer::loadInternal() { - if (Common::isSpecialDebugLevelEnabled(kGroovieDebugVideo | kGroovieDebugAll)) { + if (Common::isSpecialDebugLevelEnabled(kGroovieDebugVideo) || + Common::isSpecialDebugLevelEnabled(kGroovieDebugAll)) { int8 i; debugN(1, "Groovie::VDX: New VDX: bitflags are "); for (i = 15; i >= 0; i--) { @@ -161,7 +162,7 @@ bool VDXPlayer::playFrameInternal() { // Wait until the current frame can be shown - if (!(Common::getEnabledSpecialDebugLevels() & kGroovieDebugFast)) { + if (!Common::isSpecialDebugLevelEnabled(kGroovieDebugFast)) { waitFrame(); } // TODO: Move it to a better place @@ -492,7 +493,7 @@ void VDXPlayer::chunkSound(Common::ReadStream *in) { byte *data = new byte[60000]; int chunksize = in->read(data, 60000); - if (!(Common::getEnabledSpecialDebugLevels() & kGroovieDebugFast)) { + if (!Common::isSpecialDebugLevelEnabled(kGroovieDebugFast)) { _audioStream->queueBuffer(data, chunksize); } } diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp index 78c2c410e0..fbffffb9e0 100644 --- a/engines/scumm/debugger.cpp +++ b/engines/scumm/debugger.cpp @@ -47,7 +47,7 @@ void debugC(int channel, const char *s, ...) { // FIXME: Still spew all debug at -d9, for crashes in startup etc. // Add setting from commandline ( / abstract channel interface) - if (!(Common::getEnabledSpecialDebugLevels() & channel) && (gDebugLevel < 9)) + if (!Common::isSpecialDebugLevelEnabled(channel) && (gDebugLevel < 9)) return; va_start(va, s); |