[Scummvm-git-logs] scummvm master -> 56bff2d058a89bbdfc7dbab0042d8b5abfd3604f

[sev-]

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

Summary:
39e11cc04d MACVENTURE: Support file layout of Deja Vu II
f7f37a7e5a MACVENTURE: Select self object when clicking on empty inventory area
56bff2d058 MACVENTURE: Capitalize main window title


Commit: 39e11cc04dcc2af397fb072817727603206282be
    https://github.com/scummvm/scummvm/commit/39e11cc04dcc2af397fb072817727603206282be
Author: Alikhan Balpykov (luxrage1990 at gmail.com)
Date: 2025-08-21T08:52:24+02:00

Commit Message:
MACVENTURE: Support file layout of Deja Vu II

Changed paths:
    engines/macventure/macventure.cpp
    engines/macventure/macventure.h
    engines/macventure/metaengine.cpp


diff --git a/engines/macventure/macventure.cpp b/engines/macventure/macventure.cpp
index f4d18e60807..f8037f9987c 100644
--- a/engines/macventure/macventure.cpp
+++ b/engines/macventure/macventure.cpp
@@ -138,6 +138,8 @@ Common::Error MacVentureEngine::run() {
 	_decodingNamingArticles = new StringTable(this, _resourceManager, kNamingArticlesStringTableID);
 	_decodingIndirectArticles = new StringTable(this, _resourceManager, kIndirectArticlesStringTableID);
 
+	SearchMan.addSubDirectoryMatching(_gamePath, _filenames->getString(3));
+
 	loadDataBundle();
 
 	// Big class instantiation
@@ -1149,13 +1151,7 @@ Common::String MacVentureEngine::getCommandsPausedString() const {
 }
 
 Common::Path MacVentureEngine::getFilePath(FilePathID id) const {
-	if (id <= 3) { // We don't want a file in the subdirectory
-		return Common::Path(_filenames->getString(id));
-	} else { // We want a game file
-		Common::Path path(_filenames->getString(3));
-		path.joinInPlace(_filenames->getString(id));
-		return path;
-	}
+	return Common::Path(_filenames->getString(id));
 }
 
 bool MacVentureEngine::isOldText() const {
diff --git a/engines/macventure/macventure.h b/engines/macventure/macventure.h
index 28fd9192c09..b7cb2d18074 100644
--- a/engines/macventure/macventure.h
+++ b/engines/macventure/macventure.h
@@ -221,6 +221,8 @@ public:
 	MacVentureEngine(OSystem *syst, const ADGameDescription *gameDesc);
 	~MacVentureEngine() override;
 
+	void initializePath(const Common::FSNode &gamePath) override;
+
 	bool hasFeature(EngineFeature f) const override;
 
 	Common::Error run() override;
@@ -378,6 +380,7 @@ private: // Attributes
 
 	SoundManager *_soundManager;
 
+	Common::FSNode _gamePath;
 	Common::Archive *_dataBundle;
 
 	// Engine state
diff --git a/engines/macventure/metaengine.cpp b/engines/macventure/metaengine.cpp
index aee390c6a3b..a1d8dc89880 100644
--- a/engines/macventure/metaengine.cpp
+++ b/engines/macventure/metaengine.cpp
@@ -62,6 +62,11 @@ bool MacVentureMetaEngine::hasFeature(MetaEngineFeature f) const {
 		(f == kSavesUseExtendedFormat);
 }
 
+void MacVentureEngine::initializePath(const Common::FSNode &gamePath) {
+	Engine::initializePath(gamePath);
+	_gamePath = gamePath;
+}
+
 bool MacVentureEngine::hasFeature(EngineFeature f) const {
 	return
 		(f == kSupportsReturnToLauncher) ||


Commit: f7f37a7e5aba1e9e3df32fd00b0fa2e83be1cd2d
    https://github.com/scummvm/scummvm/commit/f7f37a7e5aba1e9e3df32fd00b0fa2e83be1cd2d
Author: Alikhan Balpykov (luxrage1990 at gmail.com)
Date: 2025-08-21T08:52:24+02:00

Commit Message:
MACVENTURE: Select self object when clicking on empty inventory area

Changed paths:
    engines/macventure/gui.cpp


diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp
index 35151b59a18..63b7c8309c6 100644
--- a/engines/macventure/gui.cpp
+++ b/engines/macventure/gui.cpp
@@ -1717,14 +1717,21 @@ bool Gui::processInventoryEvents(WindowReference ref, WindowClick click, Common:
 			Common::Rect lassoArea(topLeft, bottomRight);
 
 			Common::Array<ObjID> &selectedObjects = _engine->getSelectedObjects();
+			bool selectSelfWindow = true;
+
 			for (auto &obj : data.children) {
 				ObjID id = obj.obj;
 				Common::Rect bounds = _engine->getObjBounds(id);
 				if (lassoArea.intersects(bounds) || lassoArea.contains(bounds)) {
 					_engine->selectObject(id);
 					selectedObjects.push_back(id);
+					selectSelfWindow = false;
 				}
 			}
+
+			if (selectSelfWindow) {
+				_engine->handleObjectSelect(1, kSelfWindow, false, false);
+			}
 		}
 
 		_lassoBeingDrawn = false;


Commit: 56bff2d058a89bbdfc7dbab0042d8b5abfd3604f
    https://github.com/scummvm/scummvm/commit/56bff2d058a89bbdfc7dbab0042d8b5abfd3604f
Author: Alikhan Balpykov (luxrage1990 at gmail.com)
Date: 2025-08-21T08:52:24+02:00

Commit Message:
MACVENTURE: Capitalize main window title

Changed paths:
    engines/macventure/macventure.cpp
    engines/macventure/macventure.h


diff --git a/engines/macventure/macventure.cpp b/engines/macventure/macventure.cpp
index f8037f9987c..7c3f27fac10 100644
--- a/engines/macventure/macventure.cpp
+++ b/engines/macventure/macventure.cpp
@@ -979,7 +979,7 @@ void MacVentureEngine::openObject(ObjID objID) {
 		_gui->updateWindowInfo(kMainGameWindow, objID, _world->getChildren(objID, true));
 		_gui->updateWindow(kMainGameWindow, _world->getObjAttr(objID, kAttrContainerOpen));
 		updateExits();
-		_gui->setWindowTitle(kMainGameWindow, _world->getText(objID, objID, objID)); // it ignores source and target in the original
+		_gui->setWindowTitle(kMainGameWindow, capitalize(_world->getText(objID, objID, objID))); // it ignores source and target in the original
 	} else { // Open inventory window
 		Common::Point p(_world->getObjAttr(objID, kAttrPosX), _world->getObjAttr(objID, kAttrPosY));
 		WindowReference invID = _gui->createInventoryWindow(objID);
@@ -1319,6 +1319,23 @@ bool MacVentureEngine::loadTextHuffman() {
 	return false;
 }
 
+Common::String MacVentureEngine::capitalize(const Common::String &str) const {
+	Common::String out(str);
+	bool shouldCapitalize = true;
+
+	for (char &c : out) {
+		if (shouldCapitalize) {
+			c = toupper(c);
+			shouldCapitalize = false;
+		} else {
+			if (c == ' ')
+				shouldCapitalize = true;
+		}
+	}
+
+	return out;
+}
+
 // Global Settings
 GlobalSettings::GlobalSettings() {
 }
diff --git a/engines/macventure/macventure.h b/engines/macventure/macventure.h
index b7cb2d18074..83f66a03158 100644
--- a/engines/macventure/macventure.h
+++ b/engines/macventure/macventure.h
@@ -361,6 +361,8 @@ private:
 
 	const char *getGameFileName() const;
 
+	Common::String capitalize(const Common::String &str) const;
+
 private: // Attributes
 
 	const ADGameDescription *_gameDescription;