diff options
-rw-r--r-- | engines/sludge/imgloader.cpp | 2 | ||||
-rw-r--r-- | engines/sludge/moreio.cpp | 2 | ||||
-rw-r--r-- | engines/sludge/sludge.cpp | 4 | ||||
-rw-r--r-- | engines/sludge/sludge.h | 3 | ||||
-rw-r--r-- | engines/sludge/sludger.cpp | 11 | ||||
-rw-r--r-- | engines/sludge/sprbanks.cpp | 4 |
6 files changed, 14 insertions, 12 deletions
diff --git a/engines/sludge/imgloader.cpp b/engines/sludge/imgloader.cpp index 86f6b2fce5..64c8d7806f 100644 --- a/engines/sludge/imgloader.cpp +++ b/engines/sludge/imgloader.cpp @@ -33,7 +33,7 @@ namespace Sludge { bool ImgLoader::loadImage(Common::SeekableReadStream *stream, Graphics::Surface *dest, int reserve) { - debugC(2, kSludgeDebugDataLoad, "Loading image at position: %i", stream->pos()); + debugC(3, kSludgeDebugDataLoad, "Loading image at position: %i", stream->pos()); int32 start_ptr = stream->pos(); if (!loadPNGImage(stream, dest)) { stream->seek(start_ptr); diff --git a/engines/sludge/moreio.cpp b/engines/sludge/moreio.cpp index a5c7318bdd..4a57000549 100644 --- a/engines/sludge/moreio.cpp +++ b/engines/sludge/moreio.cpp @@ -46,7 +46,7 @@ Common::String readString(Common::SeekableReadStream *stream) { for (int a = 0; a < len; a++) { res += (char)(stream->readByte() - 1); } - debugC(2, kSludgeDebugDataLoad, "Read string of length %i: %s", len, res.c_str()); + debugC(3, kSludgeDebugDataLoad, "Read string of length %i: %s", len, res.c_str()); return res; } diff --git a/engines/sludge/sludge.cpp b/engines/sludge/sludge.cpp index aeb62538cd..9976652c48 100644 --- a/engines/sludge/sludge.cpp +++ b/engines/sludge/sludge.cpp @@ -53,9 +53,9 @@ SludgeEngine::SludgeEngine(OSystem *syst, const SludgeGameDescription *gameDesc) DebugMan.addDebugChannel(kSludgeDebugBuiltin, "Built-in", "Built-in debug level"); DebugMan.addDebugChannel(kSludgeDebugGraphics, "Graphics", "Graphics debug level"); DebugMan.addDebugChannel(kSludgeDebugZBuffer, "ZBuffer", "ZBuffer debug level"); + DebugMan.addDebugChannel(kSludgeDebugSound, "Sound", "Sound debug level"); - DebugMan.enableDebugChannel("Built-in"); - DebugMan.enableDebugChannel("Stack Machine"); + DebugMan.enableDebugChannel("Sound"); // init graphics _origFormat = new Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0); diff --git a/engines/sludge/sludge.h b/engines/sludge/sludge.h index ada139a889..d868754014 100644 --- a/engines/sludge/sludge.h +++ b/engines/sludge/sludge.h @@ -55,7 +55,8 @@ enum { kSludgeDebugStackMachine = 1 << 2, kSludgeDebugBuiltin = 1 << 3, kSludgeDebugGraphics = 1 << 4, - kSludgeDebugZBuffer = 1 << 5 + kSludgeDebugZBuffer = 1 << 5, + kSludgeDebugSound = 1 << 6 }; class SludgeEngine: public Engine { diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp index 8f7bfb882b..8e49b32465 100644 --- a/engines/sludge/sludger.cpp +++ b/engines/sludge/sludger.cpp @@ -178,6 +178,7 @@ bool initSludge(const Common::String &filename) { for (int fn = 0; fn < numResourceNames; fn++) { allResourceNames[fn].clear(); allResourceNames[fn] = readString(fp); + debugC(2, kSludgeDebugDataLoad, "Resource %i: %s", fn, allResourceNames[fn].c_str()); } } } @@ -918,16 +919,16 @@ bool loadFunctionCode(LoadedFunction *newFunc) { if (!g_sludge->_resMan->openSubSlice(newFunc->originalNumber)) return false; - debugC(2, kSludgeDebugDataLoad, "Load function code"); + debugC(3, kSludgeDebugDataLoad, "Load function code"); Common::SeekableReadStream *readStream = g_sludge->_resMan->getData(); newFunc->unfreezable = readStream->readByte(); numLines = readStream->readUint16BE(); - debugC(2, kSludgeDebugDataLoad, "numLines: %i", numLines); + debugC(3, kSludgeDebugDataLoad, "numLines: %i", numLines); newFunc->numArgs = readStream->readUint16BE(); - debugC(2, kSludgeDebugDataLoad, "numArgs: %i", newFunc->numArgs); + debugC(3, kSludgeDebugDataLoad, "numArgs: %i", newFunc->numArgs); newFunc->numLocals = readStream->readUint16BE(); - debugC(2, kSludgeDebugDataLoad, "numLocals: %i", newFunc->numLocals); + debugC(3, kSludgeDebugDataLoad, "numLocals: %i", newFunc->numLocals); newFunc->compiledLines = new LineOfCode[numLines]; if (!checkNew(newFunc->compiledLines)) return false; @@ -935,7 +936,7 @@ bool loadFunctionCode(LoadedFunction *newFunc) { for (numLinesRead = 0; numLinesRead < numLines; numLinesRead++) { newFunc->compiledLines[numLinesRead].theCommand = (sludgeCommand)readStream->readByte(); newFunc->compiledLines[numLinesRead].param = readStream->readUint16BE(); - debugC(2, kSludgeDebugDataLoad, "command line %i: %i", numLinesRead, + debugC(3, kSludgeDebugDataLoad, "command line %i: %i", numLinesRead, newFunc->compiledLines[numLinesRead].theCommand); } g_sludge->_resMan->finishAccess(); diff --git a/engines/sludge/sprbanks.cpp b/engines/sludge/sprbanks.cpp index 265257c871..5bc5de2fdf 100644 --- a/engines/sludge/sprbanks.cpp +++ b/engines/sludge/sprbanks.cpp @@ -46,11 +46,11 @@ LoadedSpriteBank *GraphicsManager::loadBankForAnim(int ID) { returnMe->ID = ID; if (loadSpriteBank(ID, returnMe->bank, false)) { returnMe->timesUsed = 0; - debugC(2, kSludgeDebugDataLoad, "loadBankForAnim: New sprite bank created OK"); + debugC(3, kSludgeDebugDataLoad, "loadBankForAnim: New sprite bank created OK"); _allLoadedBanks.push_back(returnMe); return returnMe; } else { - debugC(2, kSludgeDebugDataLoad, "loadBankForAnim: I guess I couldn't load the sprites..."); + debugC(3, kSludgeDebugDataLoad, "loadBankForAnim: I guess I couldn't load the sprites..."); return nullptr; } } else |