[Scummvm-git-logs] scummvm master -> 420e53e9c8d67943553307b92c55ceda6677a90d

[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:
400a79797c MAKE: Fix custom rules after in engine makefiles
dae4b81470 DIRECTOR: DEBUGGER: Sort Archive tags and members
420e53e9c8 DIRECTOR: DEBUGGER: Put Hex viewer in pane in Archive window


Commit: 400a79797c94efda89783ed9591a53839f497ffd
    https://github.com/scummvm/scummvm/commit/400a79797c94efda89783ed9591a53839f497ffd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-28T23:53:52+02:00

Commit Message:
MAKE: Fix custom rules after in engine makefiles

The variable was renamed in 2f0596091353d176d95479e5d82cd9d7a10e6a08
but the engine configs were not updated accordingly

Changed paths:
    engines/director/module.mk
    engines/hypno/module.mk
    engines/private/module.mk


diff --git a/engines/director/module.mk b/engines/director/module.mk
index e7d45b58de5..771d95028b9 100644
--- a/engines/director/module.mk
+++ b/engines/director/module.mk
@@ -163,7 +163,7 @@ MODULE_OBJS += \
 endif
 
 # HACK: Skip this when including the file for detection objects.
-ifeq "$(USE_RULES)" "1"
+ifeq "$(LOAD_RULES_MK)" "1"
 director-grammar:
 	`brew --prefix flex`/bin/flex engines/director/lingo/lingo-lex.l
 	`brew --prefix bison`/bin/bison -dv engines/director/lingo/lingo-gr.y
diff --git a/engines/hypno/module.mk b/engines/hypno/module.mk
index d47ee35c31f..e3325ace939 100644
--- a/engines/hypno/module.mk
+++ b/engines/hypno/module.mk
@@ -30,7 +30,7 @@ MODULE_DIRS += \
 	engines/hypno
 
 # HACK: Skip this when including the file for detection objects.
-ifeq "$(USE_RULES)" "1"
+ifeq "$(LOAD_RULES_MK)" "1"
 hypno-grammar:
 	flex engines/hypno/lexer_arc.l
 	bison engines/hypno/grammar_arc.y
diff --git a/engines/private/module.mk b/engines/private/module.mk
index 245d7479612..b1f187dbde7 100644
--- a/engines/private/module.mk
+++ b/engines/private/module.mk
@@ -15,7 +15,7 @@ MODULE_DIRS += \
 	engines/private
 
 # HACK: Skip this when including the file for detection objects.
-ifeq "$(USE_RULES)" "1"
+ifeq "$(LOAD_RULES_MK)" "1"
 private-grammar:
 	flex engines/private/lexer.l
 	bison engines/private/grammar.y


Commit: dae4b81470d1c0f16426ec7091bd68a1dc0f6cdb
    https://github.com/scummvm/scummvm/commit/dae4b81470d1c0f16426ec7091bd68a1dc0f6cdb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-29T00:16:22+02:00

Commit Message:
DIRECTOR: DEBUGGER: Sort Archive tags and members

Changed paths:
    engines/director/debugtools.cpp


diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index 6de3030bc5a..2eba4989c90 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -3398,12 +3398,13 @@ static void showArchive() {
 				Archive *archive = it._value;
 
 				if (ImGui::TreeNode(archive->getPathName().toString().c_str())) {
-					const Common::Array<uint32> &typeList = archive->getResourceTypeList();
+					Common::Array<uint32> typeList = archive->getResourceTypeList();
+					Common::sort(typeList.begin(), typeList.end());
 
 					for (auto tag : typeList) {
-						ImGui::SetNextItemOpen(true);
-						if (ImGui::TreeNode("%s", tag2str(tag))) {
-							const Common::Array<uint16> &resList = archive->getResourceIDList(tag);
+						if (ImGui::TreeNode((void*)(intptr_t)tag, "%s", tag2str(tag))) {
+							Common::Array<uint16> resList = archive->getResourceIDList(tag);
+							Common::sort(resList.begin(), resList.end());
 
 							for (auto id : resList) {
 								if (ImGui::Selectable(Common::String::format("%d", id).c_str())) {


Commit: 420e53e9c8d67943553307b92c55ceda6677a90d
    https://github.com/scummvm/scummvm/commit/420e53e9c8d67943553307b92c55ceda6677a90d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-29T00:45:57+02:00

Commit Message:
DIRECTOR: DEBUGGER: Put Hex viewer in pane in Archive window

Changed paths:
    engines/director/debugtools.cpp


diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index 2eba4989c90..458d6439567 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -3387,12 +3387,12 @@ static void showArchive() {
 	ImVec2 pos(40, 40);
 	ImGui::SetNextWindowPos(pos, ImGuiCond_FirstUseEver);
 
-	ImVec2 windowSize = ImGui::GetMainViewport()->Size / 2;
+	ImVec2 windowSize = ImGui::GetMainViewport()->Size * 0.8;
 	ImGui::SetNextWindowSize(windowSize, ImGuiCond_FirstUseEver);
 
 	if (ImGui::Begin("Archive", &_state->_w.archive)) {
 		{ // Left pane
-			ImGui::BeginChild("ChildL", ImVec2(ImGui::GetContentRegionAvail().x * 0.5f, ImGui::GetContentRegionAvail().y), ImGuiChildFlags_None);
+			ImGui::BeginChild("ChildL", ImVec2(ImGui::GetContentRegionAvail().x * 0.3f, ImGui::GetContentRegionAvail().y), ImGuiChildFlags_None);
 
 			for (auto &it : g_director->_allSeenResFiles) {
 				Archive *archive = it._value;
@@ -3434,11 +3434,17 @@ static void showArchive() {
 			ImGui::EndChild();
 		}
 
+		ImGui::SameLine();
+
 		{ // Right pane
-			ImGui::BeginChild("ChildR", ImVec2(ImGui::GetContentRegionAvail().x * 0.5f, ImGui::GetContentRegionAvail().y), ImGuiChildFlags_Border);
+			ImGui::BeginChild("ChildR", ImVec2(ImGui::GetContentRegionAvail().x, ImGui::GetContentRegionAvail().y), ImGuiChildFlags_Border);
+
+			ImGui::Text("Resource %s %d (%d bytes)", tag2str(_state->_archive.resType), _state->_archive.resId, _state->_archive.dataSize);
+
+			ImGui::Separator();
 
 			if (!_state->_archive.path.empty())
-				_state->_archive.memEdit.DrawWindow("Browser", _state->_archive.data, _state->_archive.dataSize);
+				_state->_archive.memEdit.DrawContents(_state->_archive.data, _state->_archive.dataSize);
 
 			ImGui::EndChild();
 		}