[Scummvm-git-logs] scummvm master -> af5a2f2d80898d66927a8539587899ca1822825e

[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:
af5a2f2d80 DIRECTOR: Activate code decompiler


Commit: af5a2f2d80898d66927a8539587899ca1822825e
    https://github.com/scummvm/scummvm/commit/af5a2f2d80898d66927a8539587899ca1822825e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-17T18:53:14+02:00

Commit Message:
DIRECTOR: Activate code decompiler

This reverts commit 5cfe7527593fa9010a2a006c63d60b295bbd07f3.

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


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index eed6dcd75c5..39a8ed9fe09 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -1264,7 +1264,6 @@ void Cast::loadLingoContext(Common::SeekableReadStreamEndian &stream) {
 		error("Cast::loadLingoContext: unsupported Director version (%d)", _version);
 	}
 
-#if 0
 	// Rewind stream
 	stream.seek(0);
 	_chunkResolver = new ChunkResolver(this);
@@ -1276,8 +1275,6 @@ void Cast::loadLingoContext(Common::SeekableReadStreamEndian &stream) {
 	for (auto it = _lingodec->scripts.begin(); it != _lingodec->scripts.end(); ++it) {
 		warning("[%d/%d] %s", it->second->castID, it->first, it->second->scriptText("\n", false).c_str());
 	}
-
-#endif
 }
 
 void Cast::loadScriptV2(Common::SeekableReadStreamEndian &stream, uint16 id) {
diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index 60f2126b137..e1472eaedfb 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -1287,14 +1287,10 @@ static void showFuncList() {
 								script.handlerId = functionHandler._key;
 								script.handlerName = getHandlerName(functionHandler._value);
 								uint32 scriptId = movie->getCastMemberInfo(memberID)->scriptId;
-								if (cast._value->_lingodec && cast._value->_lingodec->scripts.find(scriptId) != cast._value->_lingodec->scripts.end()) {
-									const LingoDec::Script *s = cast._value->_lingodec->scripts[scriptId];
-									ImGuiNodeVisitor visitor(script);
-									for (auto &h : s->handlers) {
-										h.ast.root->accept(visitor);
-									}
-								} else {
-									getScriptCode(script, functionHandler._value);
+								const LingoDec::Script *s = cast._value->_lingodec->scripts[scriptId];
+								ImGuiNodeVisitor visitor(script);
+								for (auto &h : s->handlers) {
+									h.ast.root->accept(visitor);
 								}
 								setScriptToDisplay(script);
 							}