diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/zvision/rlf_animation.cpp | 12 | ||||
-rw-r--r-- | engines/zvision/script_manager.cpp | 4 | ||||
-rw-r--r-- | engines/zvision/zfs_archive.cpp | 6 | ||||
-rw-r--r-- | engines/zvision/zvision.cpp | 4 |
4 files changed, 11 insertions, 15 deletions
diff --git a/engines/zvision/rlf_animation.cpp b/engines/zvision/rlf_animation.cpp index 79638511ad..72da42737c 100644 --- a/engines/zvision/rlf_animation.cpp +++ b/engines/zvision/rlf_animation.cpp @@ -242,8 +242,7 @@ void RlfAnimation::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint3 if (sourceOffset + 1 >= sourceSize) { return; } else if (destOffset + 1 >= destSize) { - // TODO: Make this warning silent or in a high debug level. It happens for almost all frames. - //warning("Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize); + debug(2, "Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize); return; } @@ -263,8 +262,7 @@ void RlfAnimation::decodeMaskedRunLengthEncoding(int8 *source, int8 *dest, uint3 if (sourceOffset + 1 >= sourceSize) { return; } else if (destOffset + 1 >= destSize) { - // TODO: Make this warning silent or in a high debug level. It happens for almost all frames. - //warning("Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize); + debug(2, "Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize); return; } @@ -290,8 +288,7 @@ void RlfAnimation::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint3 if (sourceOffset + 1 >= sourceSize) { return; } else if (destOffset + 1 >= destSize) { - // TODO: Make this warning silent or in a high debug level. It happens for almost all frames. - //warning("Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize); + debug(2, "Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize); return; } @@ -320,8 +317,7 @@ void RlfAnimation::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint3 numberOfSamples += 2; while (numberOfSamples > 0) { if (destOffset + 1 >= destSize) { - // TODO: Make this warning silent or in a high debug level. It happens for almost all frames. - //warning("Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize); + debug(2, "Frame decoding overflow\n\tsourceOffset=%u\tsourceSize=%u\n\tdestOffset=%u\tdestSize=%u", sourceOffset, sourceSize, destOffset, destSize); return; } diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp index 75f88ddd8a..e23a08f92e 100644 --- a/engines/zvision/script_manager.cpp +++ b/engines/zvision/script_manager.cpp @@ -173,7 +173,7 @@ void ScriptManager::checkPuzzleCriteria() { // criteriaList can be empty. Aka, the puzzle should be executed immediately if (puzzle->criteriaList.empty() || criteriaMet) { - debug("Puzzle %u criteria passed. Executing its ResultActions", puzzle->key); + debug(1, "Puzzle %u criteria passed. Executing its ResultActions", puzzle->key); // Set the puzzle as completed setStateValue(puzzle->key, 1); @@ -306,7 +306,7 @@ void ScriptManager::onKeyUp(Common::KeyState keyState) { void ScriptManager::changeLocation(char world, char room, char node, char view, uint32 offset) { assert(world != 0); - debug("Changing location to: %c %c %c %c %u", world, room, node, view, offset); + debug(1, "Changing location to: %c %c %c %c %u", world, room, node, view, offset); // Auto save _engine->getSaveManager()->autoSave(); diff --git a/engines/zvision/zfs_archive.cpp b/engines/zvision/zfs_archive.cpp index 5f4b2a2cd9..0836336f30 100644 --- a/engines/zvision/zfs_archive.cpp +++ b/engines/zvision/zfs_archive.cpp @@ -41,17 +41,17 @@ ZfsArchive::ZfsArchive(const Common::String &fileName) : _fileName(fileName) { readHeaders(&zfsFile); - debug(0, "ZfsArchive::ZfsArchive(%s): Located %d files", _fileName.c_str(), _entryHeaders.size()); + debug(1, "ZfsArchive::ZfsArchive(%s): Located %d files", _fileName.c_str(), _entryHeaders.size()); } ZfsArchive::ZfsArchive(const Common::String &fileName, Common::SeekableReadStream *stream) : _fileName(fileName) { readHeaders(stream); - debug(0, "ZfsArchive::ZfsArchive(%s): Located %d files", _fileName.c_str(), _entryHeaders.size()); + debug(1, "ZfsArchive::ZfsArchive(%s): Located %d files", _fileName.c_str(), _entryHeaders.size()); } ZfsArchive::~ZfsArchive() { - debug(0, "ZfsArchive Destructor Called"); + debug(1, "ZfsArchive Destructor Called"); ZfsEntryHeaderMap::iterator it = _entryHeaders.begin(); for ( ; it != _entryHeaders.end(); ++it) { delete it->_value; diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp index 9fa3cd32e7..6cdc144424 100644 --- a/engines/zvision/zvision.cpp +++ b/engines/zvision/zvision.cpp @@ -61,11 +61,11 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc) _stringManager(nullptr), _cursorManager(nullptr) { - debug("ZVision::ZVision"); + debug(1, "ZVision::ZVision"); } ZVision::~ZVision() { - debug("ZVision::~ZVision"); + debug(1, "ZVision::~ZVision"); // Dispose of resources delete _console; |