[Scummvm-git-logs] scummvm master -> 274be0598648ae836f0c335ef33caa78b25258bb

rvanlaar roland at rolandvanlaar.nl
Sun Jul 26 14:53:58 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:
274be05986 DIRECTOR: LINGO: use lctxIndex in lscr dumps


Commit: 274be0598648ae836f0c335ef33caa78b25258bb
    https://github.com/scummvm/scummvm/commit/274be0598648ae836f0c335ef33caa78b25258bb
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2020-07-26T16:44:42+02:00

Commit Message:
DIRECTOR: LINGO: use lctxIndex in lscr dumps

Dumpfiles for Lingoscripts (lscr) were named based on the castId.
The castId read from the script is not always unique causing
name clashes for the dumps.
The lctxIndex for scripts is unique, resolving the name clash.

Changed paths:
    engines/director/lingo/lingo-bytecode.cpp


diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index 6ab8734604..1945b5cfb8 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -1148,7 +1148,7 @@ ScriptContext *Lingo::compileLingoV4(Common::SeekableSubReadStreamEndian &stream
 	bool skipdump = false;
 
 	if (ConfMan.getBool("dump_scripts")) {
-		Common::String buf = dumpScriptName(archName.c_str(), scriptType, castId, "lscr");
+		Common::String buf = dumpScriptName(archName.c_str(), scriptType, lctxIndex, "lscr");
 
 		if (!out.open(buf, true)) {
 			warning("Lingo::addCodeV4(): Can not open dump file %s", buf.c_str());




More information about the Scummvm-git-logs mailing list