[Scummvm-git-logs] scummvm master -> 5cfe7527593fa9010a2a006c63d60b295bbd07f3

[scemino]

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:
5cfe752759 DIRECTOR: Revert code decompiler activation


Commit: 5cfe7527593fa9010a2a006c63d60b295bbd07f3
    https://github.com/scummvm/scummvm/commit/5cfe7527593fa9010a2a006c63d60b295bbd07f3
Author: scemino (scemino74 at gmail.com)
Date: 2024-05-17T14:31:39+02:00

Commit Message:
DIRECTOR: Revert code decompiler activation

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


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 39a8ed9fe09..eed6dcd75c5 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -1264,6 +1264,7 @@ 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);
@@ -1275,6 +1276,8 @@ 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 e1472eaedfb..60f2126b137 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -1287,10 +1287,14 @@ static void showFuncList() {
 								script.handlerId = functionHandler._key;
 								script.handlerName = getHandlerName(functionHandler._value);
 								uint32 scriptId = movie->getCastMemberInfo(memberID)->scriptId;
-								const LingoDec::Script *s = cast._value->_lingodec->scripts[scriptId];
-								ImGuiNodeVisitor visitor(script);
-								for (auto &h : s->handlers) {
-									h.ast.root->accept(visitor);
+								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);
 								}
 								setScriptToDisplay(script);
 							}