From fa8f76ee5bf4672578112af30e264355d5548a16 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 13 Dec 2019 13:32:47 +0100
Subject: DIRECTOR: Improved image debug output

---
 engines/director/frame.cpp |  4 ++--
 engines/director/score.cpp | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 14951cf1a6..45c25f78a0 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -581,7 +581,7 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) {
 
 			CastType castType = kCastTypeNull;
 			if (_vm->getVersion() < 4) {
-				debugC(1, kDebugImages, "Channel: %d type: %d", i, _sprites[i]->_spriteType);
+				debugC(1, kDebugImages, "Frame::renderSprites(): Channel: %d type: %d", i, _sprites[i]->_spriteType);
 				switch (_sprites[i]->_spriteType) {
 				case 1:
 					castType = kCastBitmap;
@@ -950,7 +950,7 @@ void Frame::drawMatteSprite(Graphics::ManagedSurface &target, const Graphics::Su
 	}
 
 	if (whiteColor == -1) {
-		debugC(1, kDebugImages, "No white color for Matte image");
+		debugC(1, kDebugImages, "Frame::drawMatteSprite(): No white color for Matte image");
 
 		for (int yy = 0; yy < tmp.h; yy++) {
 			const byte *src = (const byte *)tmp.getBasePtr(0, yy);
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 54a78cc6a3..3cd59b70d2 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -284,7 +284,7 @@ void Score::loadSpriteImages(bool isSharedCast) {
 				break;
 			case MKTAG('B', 'I', 'T', 'D'):
 				if (isSharedCast) {
-					debugC(4, kDebugImages, "Shared cast BMP: id: %d", imgId);
+					debugC(4, kDebugImages, "Score::loadSpriteImages(): Shared cast BMP: id: %d", imgId);
 					pic = _vm->getSharedBMP()->getVal(imgId);
 					if (pic != NULL)
 						pic->seek(0); // TODO: this actually gets re-read every loop... we need to rewind it!
@@ -298,7 +298,7 @@ void Score::loadSpriteImages(bool isSharedCast) {
 			}
 
 			int w = bitmapCast->_initialRect.width(), h = bitmapCast->_initialRect.height();
-			debugC(4, kDebugImages, "id: %d, w: %d, h: %d, flags: %x, some: %x, unk1: %d, unk2: %d",
+			debugC(4, kDebugImages, "Score::loadSpriteImages(): id: %d, w: %d, h: %d, flags: %x, some: %x, unk1: %d, unk2: %d",
 				imgId, w, h, bitmapCast->_flags, bitmapCast->_someFlaggyThing, bitmapCast->_unk1, bitmapCast->_unk2);
 
 			if (pic != NULL && bitmapCast != NULL && w > 0 && h > 0) {
@@ -1266,6 +1266,9 @@ Common::Rect Score::readRect(Common::ReadStreamEndian &stream) {
 }
 
 void Score::startLoop() {
+
+	debugC(1, kDebugImages, "Score dims: %dx%d", _movieRect.width(), _movieRect.height());
+
 	initGraphics(_movieRect.width(), _movieRect.height());
 
 	_surface->create(_movieRect.width(), _movieRect.height());
@@ -1286,7 +1289,6 @@ void Score::startLoop() {
 	_frames[_currentFrame]->prepareFrame(this);
 
 	while (!_stopPlay && _currentFrame < _frames.size()) {
-		debugC(1, kDebugImages, "******************************  Current frame: %d", _currentFrame + 1);
 		update();
 
 		if (_currentFrame < _frames.size())
@@ -1303,6 +1305,8 @@ void Score::update() {
 		return;
 	}
 
+	debugC(1, kDebugImages, "******************************  Current frame: %d", _currentFrame + 1);
+
 	_surface->clear();
 	_surface->copyFrom(*_trailSurface);
 
-- 
cgit v1.2.3