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

[bluegr]

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:
bf53dafea3 NANCY: NANCY17: Add the stream names of items that were missing


Commit: bf53dafea3928889b47d23e1b67bae81800ba336
    https://github.com/scummvm/scummvm/commit/bf53dafea3928889b47d23e1b67bae81800ba336
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-10-25T12:00:11+02:00

Commit Message:
NANCY: NANCY17: Add the stream names of items that were missing

The previous commit gave back viewed items by the name of their
stream, but the function that makes that name wasn't there. The UI
now uses it as well when it opens and closes those streams.

Changed paths:
    engines/nancy/ui/ndui/button.h
    engines/nancy/ui/ndui/enginehandlers.cpp


diff --git a/engines/nancy/ui/ndui/button.h b/engines/nancy/ui/ndui/button.h
index 9cc07a94e89..3a8d5517dc9 100644
--- a/engines/nancy/ui/ndui/button.h
+++ b/engines/nancy/ui/ndui/button.h
@@ -64,6 +64,9 @@ public:
 
 	InvButton(Panel *panel) : Button(panel) {}
 
+	// The stream the scene of an item opens in
+	static Common::String getStreamName(const Common::String &itemName) { return "INVSTR_" + itemName; }
+
 	// Nancy17 buttons are made from a template, and get their item afterwards
 	void setItem(const INVD::Item &item);
 
diff --git a/engines/nancy/ui/ndui/enginehandlers.cpp b/engines/nancy/ui/ndui/enginehandlers.cpp
index 24d591810fc..a9f0eb9e0a5 100644
--- a/engines/nancy/ui/ndui/enginehandlers.cpp
+++ b/engines/nancy/ui/ndui/enginehandlers.cpp
@@ -217,7 +217,7 @@ void Manager::viewInventoryItem(int16 itemID) {
 // taken out to be looked at.
 void Manager::onItemStreamClicked(const InvButton &button) {
 	const int16 itemID = button.getItemID();
-	const Common::String streamName = "INVSTR_" + button.getName();
+	const Common::String streamName = InvButton::getStreamName(button.getName());
 	const Common::String &sceneName = button.getSceneName();
 
 	// On top of everything the scenes below draw
@@ -234,7 +234,7 @@ void Manager::onItemStreamClicked(const InvButton &button) {
 		const INVD *items = GetEngineData(INVD);
 		for (const INVD::Item &item : items->items) {
 			if (item.kind == InvButton::kItemView && item.id != itemID) {
-				NancySceneState.getStreams().end("INVSTR_" + item.name);
+				NancySceneState.getStreams().end(InvButton::getStreamName(item.name));
 			}
 		}