DIRECTOR: Improved debug output

4 files changed, 18 insertions, 11 deletions

diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 769b216f60..1d3cc4c0f5 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -168,10 +168,13 @@ Common::Error DirectorEngine::run() {
 
 	loadSharedCastsFrom(_sharedCastFile);
 
+	debug(0, "\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\nObtaining score name\n");
 	loadInitialMovie(getEXEName());
 
 	_currentScore->setArchive(_mainArchive);
-	debug(0, "Score name %s", _currentScore->getMacName().c_str());
+	debug(0, "\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
+	debug(0, "@@@@   Score name '%s'", _currentScore->getMacName().c_str());
+	debug(0, "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n");
 
 	bool loop = true;
 
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 3ecb941cfe..06bda82501 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -242,10 +242,11 @@ void Frame::readChannels(Common::ReadStreamEndian *stream) {
 		}
 
 		if (sprite._castId) {
-			debugC(4, kDebugLoading, "CH: %-3d castId: %03d(%s) (e:%d) [%x,%x, flags:%04x, %dx%d@%d,%d linesize: %d] script: %d",
-				i + 1, sprite._castId, numToCastNum(sprite._castId), sprite._enabled, sprite._x1, sprite._x2, sprite._flags,
-				sprite._width, sprite._height, sprite._startPoint.x, sprite._startPoint.y,
-				sprite._lineSize, sprite._scriptId);
+			debugC(4, kDebugLoading, "CH: %-3d castId: %03d(%s) [%x,%x, flags:%04x [ink: %x trails: %d line: %d], %dx%d@%d,%d type: %d] script: %d, flags2: %x, unk2: %x, unk3: %x",
+				i + 1, sprite._castId, numToCastNum(sprite._castId), sprite._x1, sprite._x2, sprite._flags,
+				sprite._ink, sprite._trails, sprite._lineSize, sprite._width, sprite._height,
+				sprite._startPoint.x, sprite._startPoint.y,
+				sprite._spriteType, sprite._scriptId, sprite._flags2, sprite._unk2, sprite._unk3);
 		} else {
 			debugC(4, kDebugLoading, "CH: %-3d castId: 000", i + 1);
 		}
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index b4b160597c..a735ab3fc6 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -251,7 +251,9 @@ void DirectorEngine::loadMac(const Common::String movie) {
 void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
 	Archive *shardcst = createArchive();
 
-	debug(0, "****** Loading Shared cast '%s'", filename.c_str());
+	debug(0, "\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
+	debug(0, "@@@@ Loading Shared cast '%s'", filename.c_str());
+	debug(0, "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n");
 
 	_sharedDIB = new Common::HashMap<int, Common::SeekableSubReadStreamEndian *>;
 	_sharedSTXT = new Common::HashMap<int, Common::SeekableSubReadStreamEndian *>;
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index f44c508f4b..0429e99d48 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -40,6 +40,7 @@
 #include "director/sound.h"
 #include "director/sprite.h"
 #include "director/stxt.h"
+#include "director/util.h"
 #include "director/lingo/lingo.h"
 
 namespace Director {
@@ -511,28 +512,28 @@ void Score::loadCastDataVWCR(Common::SeekableSubReadStreamEndian &stream) {
 
 		switch (castType) {
 		case kCastBitmap:
-			debugC(3, kDebugLoading, "CastTypes id: %d BitmapCast", id);
+			debugC(3, kDebugLoading, "Score::loadCastDataVWCR(): CastTypes id: %d BitmapCast", id);
 			// TODO: Work out the proper tag!
 			_loadedBitmaps->setVal(id, new BitmapCast(stream, MKTAG('B', 'I', 'T', 'D')));
 			_castTypes[id] = kCastBitmap;
 			break;
 		case kCastText:
-			debugC(3, kDebugLoading, "CastTypes id: %d TextCast", id);
+			debugC(3, kDebugLoading, "Score::loadCastDataVWCR(): CastTypes id: %d TextCast", id);
 			_loadedText->setVal(id, new TextCast(stream));
 			_castTypes[id] = kCastText;
 			break;
 		case kCastShape:
-			debugC(3, kDebugLoading, "CastTypes id: %d ShapeCast", id);
+			debugC(3, kDebugLoading, "Score::loadCastDataVWCR(): CastTypes id: %d ShapeCast", id);
 			_loadedShapes->setVal(id, new ShapeCast(stream));
 			_castTypes[id] = kCastShape;
 			break;
 		case kCastButton:
-			debugC(3, kDebugLoading, "CastTypes id: %d ButtonCast", id);
+			debugC(3, kDebugLoading, "Score::loadCastDataVWCR(): CastTypes id: %d ButtonCast", id);
 			_loadedButtons->setVal(id, new ButtonCast(stream));
 			_castTypes[id] = kCastButton;
 			break;
 		default:
-			warning("Score::loadCastDataVWCR(): Unhandled cast type: %d [%s]", castType, tag2str(castType));
+			warning("Score::loadCastDataVWCR(): Unhandled cast id: %d(%s), type: %d, %d bytes", id, numToCastNum(id), castType, size);
 			stream.skip(size - 1);
 			break;
 		}