[Scummvm-git-logs] scummvm master -> e70ac74094807a66ee8c2d5a7928836f984882a3
sev-
noreply at scummvm.org
Mon May 11 22:31:01 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
e70ac74094 DIRECTOR: Print movie info on 'windows' debugger command
Commit: e70ac74094807a66ee8c2d5a7928836f984882a3
https://github.com/scummvm/scummvm/commit/e70ac74094807a66ee8c2d5a7928836f984882a3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-05-12T00:30:39+02:00
Commit Message:
DIRECTOR: Print movie info on 'windows' debugger command
Changed paths:
engines/director/movie.cpp
engines/director/movie.h
engines/director/window.cpp
diff --git a/engines/director/movie.cpp b/engines/director/movie.cpp
index 09735609545..0d644f9146f 100644
--- a/engines/director/movie.cpp
+++ b/engines/director/movie.cpp
@@ -743,6 +743,16 @@ Symbol Movie::getHandler(const Common::String &name, uint16 castLibHint) {
return Symbol();
}
+Common::String Movie::formatMovieInfo() {
+ Common::String res = Common::String::format("name: '%s' archive: '%s' shared cast: '%s'",
+ getMacName().c_str(), getArchive()->getPathName().toString(Common::Path::kNativeSeparator).c_str(),
+ _sharedCast ? _sharedCast->getArchive()->getPathName().toString(Common::Path::kNativeSeparator).c_str() : "<none>");
+ for (auto &it : _casts) {
+ res += Common::String::format("\n castLib %d: '%s' archive: '%s'", it._key, it._value->getCastName().c_str(), it._value->getArchive()->getPathName().toString(Common::Path::kNativeSeparator).c_str());
+ }
+ return res;
+}
+
Common::String InfoEntry::readString(bool pascal) {
Common::String res;
diff --git a/engines/director/movie.h b/engines/director/movie.h
index 3388b320a56..5640c6d6f64 100644
--- a/engines/director/movie.h
+++ b/engines/director/movie.h
@@ -144,6 +144,8 @@ public:
void processEvent(LEvent event, int targetId = 0);
void queueInputEvent(LEvent event, int targetId = 0, Common::Point pos = Common::Point(-1, -1));
+ Common::String formatMovieInfo();
+
private:
void loadFileInfo(Common::SeekableReadStreamEndian &stream);
diff --git a/engines/director/window.cpp b/engines/director/window.cpp
index f6a4ffdbd5c..3e5199fd776 100644
--- a/engines/director/window.cpp
+++ b/engines/director/window.cpp
@@ -848,11 +848,11 @@ Common::String Window::formatWindowInfo() {
Common::Rect dims = _window->getDimensions();
Common::Rect innerDims = _window->getInnerDimensions();
return Common::String::format(
- "name: \"%s\", movie: \"%s\", currentPath: \"%s\", dims: (%d,%d) %dx%d, innerDims: (%d, %d) %dx%d, visible: %d",
+ "name: \"%s\", movie: \"%s\", currentPath: \"%s\", dims: (%d,%d) %dx%d, innerDims: (%d, %d) %dx%d, visible: %d\n %s",
_name.c_str(), _currentMovie->getMacName().c_str(), _currentPath.c_str(),
dims.left, dims.top, dims.width(), dims.height(),
innerDims.left, innerDims.top, innerDims.width(), innerDims.height(),
- _window->isVisible()
+ _window->isVisible(), _currentMovie->formatMovieInfo().c_str()
);
}
More information about the Scummvm-git-logs
mailing list