DIRECTOR: Dump movie scripts, and scripts from cast info

2 files changed, 16 insertions, 3 deletions

diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 16f85fc02f..1240e9ec9c 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -47,7 +47,7 @@ Score::Score(Archive &movie, Lingo &lingo, DirectorSound &soundManager) {
 	_lingo = &lingo;
 	_soundManager = &soundManager;
 	_lingo->processEvent(kEventPrepareMovie, 0);
-
+	_movieScriptCount = 0;
 	assert(_movieArchive->hasResource(MKTAG('V','W','S','C'), 1024));
 	assert(_movieArchive->hasResource(MKTAG('V','W','C','F'), 1024));
 	assert(_movieArchive->hasResource(MKTAG('V','W','C','R'), 1024));
@@ -284,7 +284,11 @@ void Score::loadScriptText(Common::SeekableReadStream &stream) {
 		}
 		script += ch;
 	}
-	_lingo->addCode(script, kMovieScript, 0);
+	_lingo->addCode(script, kMovieScript, _movieScriptCount);
+	if (ConfMan.getBool("dump_scripts")) {
+		dumpScript(_movieScriptCount, kMovieScript, script);
+	}
+	_movieScriptCount++;
 }
 
 void Score::dumpScript(uint16 id, ScriptType type, Common::String script) {
@@ -324,6 +328,10 @@ void Score::loadCastInfo(Common::SeekableReadStream &stream, uint16 id) {
 	if (ci->script != "") {
 		_lingo->addCode(ci->script, kSpriteScript, id);
 	}
+	if (!ConfMan.getBool("dump_scripts")) {
+		dumpScript(id, kSpriteScript, ci->script);
+	}
+
 	ci->name = getString(castStrings[1]);
 	ci->directory = getString(castStrings[2]);
 	ci->fileName = getString(castStrings[3]);
@@ -351,8 +359,12 @@ void Score::loadFileInfo(Common::SeekableReadStream &stream) {
 	Common::Array<Common::String> fileInfoStrings = loadStrings(stream, _flags);
 	_script = fileInfoStrings[0];
 	if (_script != "") {
-		_lingo->addCode(_script, kMovieScript, 0);
+		_lingo->addCode(_script, kMovieScript, _movieScriptCount);
+	}
+	if (!ConfMan.getBool("dump_scripts")) {
+		dumpScript(_movieScriptCount, kMovieScript, _script);
 	}
+	_movieScriptCount++;
 	_changedBy = fileInfoStrings[1];
 	_createdBy = fileInfoStrings[2];
 	_directory = fileInfoStrings[3];
diff --git a/engines/director/score.h b/engines/director/score.h
index 6156194df4..ea2402823d 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -323,6 +323,7 @@ private:
     uint32 _flags;
     bool _stopPlay;
     uint16 _castArrayEnd;
+    uint16 _movieScriptCount;
     uint16 _stageColor;
     Lingo *_lingo;
     DirectorSound *_soundManager;