[Scummvm-git-logs] scummvm master -> 585faec1cae172a94e6c9c8524d8b402fea654c6

[sev-]

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:
585faec1ca DIRECTOR: Rename 'bytecode' to 'nobytecode'. Run bytecode by default for D4+


Commit: 585faec1cae172a94e6c9c8524d8b402fea654c6
    https://github.com/scummvm/scummvm/commit/585faec1cae172a94e6c9c8524d8b402fea654c6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-06T13:19:20+02:00

Commit Message:
DIRECTOR: Rename 'bytecode' to 'nobytecode'. Run bytecode by default for D4+

Changed paths:
    engines/director/cast.cpp
    engines/director/director.cpp
    engines/director/director.h


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 4403e732bc..94606bc276 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -297,8 +297,8 @@ bool Cast::loadArchive() {
 		}
 	}
 
-	// FIXME. Bytecode disabled by default, requires --debugflags=bytecode for now
-	if (_vm->getVersion() >= 4 && debugChannelSet(-1, kDebugBytecode)) {
+	// For D4+ we may request to force Lingo scripts and skip precompiled bytecode
+	if (_vm->getVersion() >= 4 && !debugChannelSet(-1, kDebugNoBytecode)) {
 		// Try to load script name lists
 		Common::Array<uint16> lnam =  _castArchive->getResourceIDList(MKTAG('L','n','a','m'));
 		if (lnam.size() > 0) {
@@ -854,8 +854,8 @@ void Cast::loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id,
 		}
 
 		CastMember *member = _loadedCast->getVal(id);
-		// FIXME. Bytecode disabled by default, requires --debugflags=bytecode for now
-		if (_vm->getVersion() < 4 || !debugChannelSet(-1, kDebugBytecode)) {
+		// For D4+ we may force Lingo scripts
+		if (_vm->getVersion() < 4 || debugChannelSet(-1, kDebugNoBytecode)) {
 			if (!ci->script.empty()) {
 				ScriptType scriptType = kCastScript;
 				// the script type here could be wrong!
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index fe8ccb1dfe..3f870fd9a8 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -58,7 +58,7 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
 	DebugMan.addDebugChannel(kDebugSlow, "slow", "Slow playback");
 	DebugMan.addDebugChannel(kDebugFast, "fast", "Fast (no delay) playback");
 	DebugMan.addDebugChannel(kDebugNoLoop, "noloop", "Do not loop the playback");
-	DebugMan.addDebugChannel(kDebugBytecode, "bytecode", "Execute Lscr bytecode");
+	DebugMan.addDebugChannel(kDebugNoBytecode, "nobytecode", "Do not execute Lscr bytecode");
 	DebugMan.addDebugChannel(kDebugFewFramesOnly, "fewframesonly", "Only run the first 10 frames");
 	DebugMan.addDebugChannel(kDebugPreprocess, "preprocess", "Lingo preprocessing");
 	DebugMan.addDebugChannel(kDebugScreenshot, "screenshot", "screenshot each frame");
diff --git a/engines/director/director.h b/engines/director/director.h
index 786ea10591..778472fa04 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -77,7 +77,7 @@ enum {
 	kDebugSlow			= 1 << 8,
 	kDebugFast			= 1 << 9,
 	kDebugNoLoop		= 1 << 10,
-	kDebugBytecode		= 1 << 11,
+	kDebugNoBytecode	= 1 << 11,
 	kDebugFewFramesOnly	= 1 << 12,
 	kDebugPreprocess	= 1 << 13,
 	kDebugScreenshot	= 1 << 14,