diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/wintermute/Base/BFileManager.cpp | 5 | ||||
| -rw-r--r-- | engines/wintermute/Base/BGame.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/Base/font/BFontTT.cpp | 6 | ||||
| -rw-r--r-- | engines/wintermute/wintermute.cpp | 3 | ||||
| -rw-r--r-- | engines/wintermute/wintermute.h | 6 |
5 files changed, 12 insertions, 10 deletions
diff --git a/engines/wintermute/Base/BFileManager.cpp b/engines/wintermute/Base/BFileManager.cpp index 7dd7d6f0e8..00b44646f4 100644 --- a/engines/wintermute/Base/BFileManager.cpp +++ b/engines/wintermute/Base/BFileManager.cpp @@ -322,7 +322,7 @@ bool CBFileManager::registerPackages() { restoreCurrentDir();
_gameRef->LOG(0, "Scanning packages...");
- warning("Scanning packages");
+ debugC(kWinterMuteDebugFileAccess, "Scanning packages");
Common::ArchiveMemberList files;
SearchMan.listMatchingMembers(files, "*.dcp");
@@ -358,10 +358,9 @@ bool CBFileManager::registerPackages() { }
}
#endif
- warning(" Registered %d files in %d package(s)", _files.size(), _packages.getSize());
+ debugC(kWinterMuteDebugFileAccess, " Registered %d files in %d package(s)", _files.size(), _packages.getSize());
_gameRef->LOG(0, " Registered %d files in %d package(s)", _files.size(), _packages.getSize());
- warning(" Registered %d files in %d package(s)", _files.size(), _packages.getSize());
return STATUS_OK;
}
diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp index 054029ae35..f5b234a013 100644 --- a/engines/wintermute/Base/BGame.cpp +++ b/engines/wintermute/Base/BGame.cpp @@ -3818,7 +3818,7 @@ bool CBGame::getSaveSlotFilename(int slot, char *buffer) { Common::String filename = pm->getFilenameForSlot(slot);
delete pm;
strcpy(buffer, filename.c_str());
- warning("Saving %s - we really should prefix these things to avoid collisions.", buffer);
+ debugC(kWinterMuteDebugSaveGame, "getSaveSlotFileName(%d) = %s", slot, buffer);
return STATUS_OK;
}
diff --git a/engines/wintermute/Base/font/BFontTT.cpp b/engines/wintermute/Base/font/BFontTT.cpp index e4bd7cc719..4517f580b2 100644 --- a/engines/wintermute/Base/font/BFontTT.cpp +++ b/engines/wintermute/Base/font/BFontTT.cpp @@ -39,6 +39,7 @@ #include "engines/wintermute/Base/BFileManager.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/PlatformSDL.h"
+#include "engines/wintermute/wintermute.h"
#include "graphics/fonts/ttf.h"
#include "graphics/fontman.h"
#include <limits.h>
@@ -195,7 +196,7 @@ void CBFontTT::drawText(byte *text, int x, int y, int width, TTextAlign align, i // not found, create one
if (!surface) {
- warning("Draw text: %s", text);
+ debugC(kWinterMuteDebugFont, "Draw text: %s", text);
surface = renderTextToTexture(textStr, width, align, maxHeight, textOffset);
if (surface) {
// write surface to cache
@@ -257,7 +258,8 @@ CBSurface *CBFontTT::renderTextToTexture(const WideString &text, int width, TTex hasWarned = true;
warning("CBFontTT::RenderTextToTexture - Not fully ported yet");
}
- warning("%s %d %d %d %d", text.c_str(), RGBCOLGetR(_layers[0]->_color), RGBCOLGetG(_layers[0]->_color), RGBCOLGetB(_layers[0]->_color), RGBCOLGetA(_layers[0]->_color));
+
+ debugC(kWinterMuteDebugFont, "%s %d %d %d %d", text.c_str(), RGBCOLGetR(_layers[0]->_color), RGBCOLGetG(_layers[0]->_color), RGBCOLGetB(_layers[0]->_color), RGBCOLGetA(_layers[0]->_color));
// void drawString(Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, TextAlign align = kTextAlignLeft, int deltax = 0, bool useEllipsis = true) const;
Graphics::Surface *surface = new Graphics::Surface();
if (_deletableFont) // We actually have a TTF
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp index 835aa74e88..528c379aa9 100644 --- a/engines/wintermute/wintermute.cpp +++ b/engines/wintermute/wintermute.cpp @@ -58,7 +58,8 @@ WinterMuteEngine::WinterMuteEngine(OSystem *syst, const ADGameDescription *desc) // Here is the right place to set up the engine specific debug channels DebugMan.addDebugChannel(kWinterMuteDebugLog, "enginelog", "Covers the same output as the log-file in WME"); DebugMan.addDebugChannel(kWinterMuteDebugSaveGame, "savegame", "Savegames"); - + DebugMan.addDebugChannel(kWinterMuteDebugFont, "font", "Text-drawing-related messages"); + DebugMan.addDebugChannel(kWinterMuteDebugFileAccess, "file-access", "Non-critical problems like missing files"); // Don't forget to register your random source _rnd = new Common::RandomSource("WinterMute"); diff --git a/engines/wintermute/wintermute.h b/engines/wintermute/wintermute.h index 189f879eea..bf716a5a1f 100644 --- a/engines/wintermute/wintermute.h +++ b/engines/wintermute/wintermute.h @@ -36,9 +36,9 @@ class CSysClassRegistry; // our engine debug channels enum { kWinterMuteDebugLog = 1 << 0, // The debug-logs from the original engine - kWinterMuteDebugSaveGame = 1 << 1 - // next new channel must be 1 << 2 (4) - // the current limitation is 32 debug channels (1 << 31 is the last one) + kWinterMuteDebugSaveGame = 1 << 1, + kWinterMuteDebugFont = 1 << 2, // next new channel must be 1 << 2 (4) + kWinterMuteDebugFileAccess = 1 << 3 // the current limitation is 32 debug channels (1 << 31 is the last one) }; class WinterMuteEngine : public Engine { |