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

[sev-]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
891bcf7818 QDENGINE: DT: Always enlist all available packages
3857521b03 QDENGINE: DT: Stop playback on QDA file switch
d4a60a2106 QDENGINE: DT: Do not crash on empty frames


Commit: 891bcf78186986c4768df13ba3c2dd538669c98c
    https://github.com/scummvm/scummvm/commit/891bcf78186986c4768df13ba3c2dd538669c98c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-07T01:59:25+02:00

Commit Message:
QDENGINE: DT: Always enlist all available packages

Changed paths:
    engines/qdengine/debugger/debugtools.cpp
    engines/qdengine/qdcore/qd_file_manager.h


diff --git a/engines/qdengine/debugger/debugtools.cpp b/engines/qdengine/debugger/debugtools.cpp
index afd413c62f6..b82a765d390 100644
--- a/engines/qdengine/debugger/debugtools.cpp
+++ b/engines/qdengine/debugger/debugtools.cpp
@@ -86,7 +86,7 @@ ImGuiImage getImageID(Common::Path filename, int frameNum) {
 	Graphics::ManagedSurface *surface = nullptr;
 
 	if (frameNum != TILES_ID) {
-		if (animation->tileAnimation() && 0) {
+		if (animation->tileAnimation()) {
 			Vect2i size = animation->tileAnimation()->frameSize();
 
 			sx = size.x;
@@ -167,7 +167,7 @@ void showArchives() {
 		ImGui::Separator();
 
 		// Iterate through the 3 resource pak files
-		for (int i = 0; i < 3; i++) {
+		for (int i = 0; i < qdFileManager::instance().get_num_packages(); i++) {
 			Common::Archive *archive = qdFileManager::instance().get_package(i);
 			Common::ArchiveMemberList members;
 
diff --git a/engines/qdengine/qdcore/qd_file_manager.h b/engines/qdengine/qdcore/qd_file_manager.h
index 04ea90edc0a..6b03372a3f1 100644
--- a/engines/qdengine/qdcore/qd_file_manager.h
+++ b/engines/qdengine/qdcore/qd_file_manager.h
@@ -89,7 +89,12 @@ public:
 		return _packages[idx].is_open();
 	}
 	bool is_package_available(const qdFileOwner &file_owner);
+	int get_num_packages() { return _packageCount; }
+
 	Common::Archive *get_package(int idx) {
+		if (!_packages[idx].is_open())
+			_packages[idx].open();
+
 		return _packages[idx]._container;
 	}
 


Commit: 3857521b03ecd3ce6087b47a2984ca24f8622413
    https://github.com/scummvm/scummvm/commit/3857521b03ecd3ce6087b47a2984ca24f8622413
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-07T01:59:25+02:00

Commit Message:
QDENGINE: DT: Stop playback on QDA file switch

Changed paths:
    engines/qdengine/debugger/debugtools.cpp


diff --git a/engines/qdengine/debugger/debugtools.cpp b/engines/qdengine/debugger/debugtools.cpp
index b82a765d390..9c787ffa1c4 100644
--- a/engines/qdengine/debugger/debugtools.cpp
+++ b/engines/qdengine/debugger/debugtools.cpp
@@ -183,6 +183,7 @@ void showArchives() {
 							if (it->getFileName().hasSuffixIgnoreCase(".qda")) {
 								_state->_qdaToDisplay = it->getPathInArchive();
 								_state->_qdaToDisplayFrame = 0;
+								_state->_qdaIsPlaying = false;
 							}
 					}
 				}


Commit: d4a60a210644a3b268b2ef66edebd940f7b961cb
    https://github.com/scummvm/scummvm/commit/d4a60a210644a3b268b2ef66edebd940f7b961cb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-07T01:59:25+02:00

Commit Message:
QDENGINE: DT: Do not crash on empty frames

Changed paths:
    engines/qdengine/debugger/debugtools.cpp


diff --git a/engines/qdengine/debugger/debugtools.cpp b/engines/qdengine/debugger/debugtools.cpp
index 9c787ffa1c4..eec4d174163 100644
--- a/engines/qdengine/debugger/debugtools.cpp
+++ b/engines/qdengine/debugger/debugtools.cpp
@@ -94,8 +94,10 @@ ImGuiImage getImageID(Common::Path filename, int frameNum) {
 		} else {
 			qdAnimationFrame *frame = animation->get_frame(frameNum);
 
-			sx = frame->size_x();
-			sy = frame->size_y();
+			if (frame) {
+				sx = frame->size_x();
+				sy = frame->size_y();
+			}
 		}
 
 		surface = new Graphics::ManagedSurface(sx, sy, g_engine->_pixelformat);