[Scummvm-git-logs] scummvm master -> 7a5fd2301cfb8c4659a835f79b25ba3e860304f8
npjg
nathanael.gentrydb8 at gmail.com
Wed Jun 17 13:26:34 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7a5fd2301c DIRECTOR: Prettify some debug output
Commit: 7a5fd2301cfb8c4659a835f79b25ba3e860304f8
https://github.com/scummvm/scummvm/commit/7a5fd2301cfb8c4659a835f79b25ba3e860304f8
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-17T09:26:18-04:00
Commit Message:
DIRECTOR: Prettify some debug output
Changed paths:
engines/director/score.cpp
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 8deac6ff55..39394c1f24 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -582,7 +582,7 @@ void Score::renderFrame(uint16 frameId, bool forceUpdate, bool updateStageOnly)
Common::Rect currentBbox = channel->getBbox();
_maskSurface->fillRect(currentBbox, 1);
- debugC(1, kDebugImages, "Score::renderSprite(): channel: %d, castType: %d, castId: %d", id, sprite->_castType, sprite->_castId);
+ debugC(1, kDebugImages, "Score::renderFrame(): channel: %d, castType: %d, castId: %d", id, sprite->_castType, sprite->_castId);
if (sprite->_castType == kCastShape) {
renderShape(id);
} else {
@@ -592,7 +592,7 @@ void Score::renderFrame(uint16 frameId, bool forceUpdate, bool updateStageOnly)
cast->_widget->draw();
inkBasedBlit(cast->_widget->getMask(), cast->_widget->getSurface()->rawSurface(), channel->_sprite->_ink, currentBbox, id);
} else {
- warning("Score::renderSprite: No widget for channel ID %d", id);
+ warning("Score::renderFrame(): No widget for channel ID %d", id);
}
}
@@ -775,16 +775,17 @@ Sprite *Score::getSpriteById(uint16 id) {
if (channel) {
return channel->_sprite;
} else {
- warning("Score::getSpriteById: sprite on frame %d with id %d not found", _currentFrame, id);
+ warning("Score::getSpriteById(): sprite on frame %d with id %d not found", _currentFrame, id);
return nullptr;
}
}
Channel *Score::getChannelById(uint16 id) {
if (id >= _channels.size()) {
- warning("Score::getSpriteChannelById(%d): out of bounds", id);
+ warning("Score::getChannelById(%d): out of bounds", id);
return nullptr;
}
+
return _channels[id];
}
More information about the Scummvm-git-logs
mailing list