[Scummvm-git-logs] scummvm master -> 9a377abcebe2accace493ffaac5c623de4596474

[elasota]

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

Summary:
4f64e52542 MTROPOLIS: Condense Obsidian widescreen mod into one option.
9a377abceb MTROPOLIS: Add widescreen mod GUIDs for Mac version


Commit: 4f64e5254255cbadf7444b4d6f0a95eecbdafce6
    https://github.com/scummvm/scummvm/commit/4f64e5254255cbadf7444b4d6f0a95eecbdafce6
Author: elasota (ejlasota at gmail.com)
Date: 2022-06-26T14:09:03-04:00

Commit Message:
MTROPOLIS: Condense Obsidian widescreen mod into one option.

Changed paths:
    engines/mtropolis/detection.cpp
    engines/mtropolis/mtropolis.cpp


diff --git a/engines/mtropolis/detection.cpp b/engines/mtropolis/detection.cpp
index 632e52a39cc..1a748b06119 100644
--- a/engines/mtropolis/detection.cpp
+++ b/engines/mtropolis/detection.cpp
@@ -70,22 +70,14 @@ const ExtraGuiOptions MTropolisMetaEngineDetection::getExtraGuiOptions(const Com
 
 	if (gameid == "obsidian") {
 		static const ExtraGuiOption widescreenOption = {
-			_s("Widescreen"),
-			_s("Removes upper letterbox bar"),
-			"mtropolis_enh_obsidian_widescreen",
+			_s("16:9 Widescreen Mod"),
+			_s("Removes letterboxing and moves some display elements, improving coverage on widescreen displays"),
+			"mtropolis_mod_obsidian_widescreen",
 			false,
 			0,
-			1};
-		static const ExtraGuiOption widescreenImprovedOption = {
-			_s("Enhanced Widescreen"),
-			_s("Removes the upper and lower letterbox bars and relocates inventory item graphics"),
-			"mtropolis_enh_obsidian_widescreen_improved",
-			false,
-			1,
 			0};
 
 		options.push_back(widescreenOption);
-		options.push_back(widescreenImprovedOption);
 	}
 
 	static const ExtraGuiOption launchDebugOption = {
diff --git a/engines/mtropolis/mtropolis.cpp b/engines/mtropolis/mtropolis.cpp
index abd87498113..e211e01592c 100644
--- a/engines/mtropolis/mtropolis.cpp
+++ b/engines/mtropolis/mtropolis.cpp
@@ -121,19 +121,11 @@ Common::Error MTropolisEngine::run() {
 
 		_runtime->getHacks().ignoreMismatchedProjectNameInObjectLookups = true;
 
-		if (ConfMan.getBool("mtropolis_enh_obsidian_widescreen")) {
-			preferredHeight = 420;
-
-			_runtime->getHacks().mainWindowOffset = Common::Point(0, -30);
+		if (ConfMan.getBool("mtropolis_mod_obsidian_widescreen")) {
 			_runtime->getHacks().reportDisplaySize = Common::Point(640, 480);
 
-			if (ConfMan.getBool("mtropolis_enh_obsidian_widescreen_improved")) {
-				preferredHeight = 360;
-
-				_runtime->getHacks().mainWindowOffset = Common::Point(0, 0);
-
-				HackSuites::addObsidianImprovedWidescreen(*_gameDescription, _runtime->getHacks());
-			}
+			preferredHeight = 360;
+			HackSuites::addObsidianImprovedWidescreen(*_gameDescription, _runtime->getHacks());
 		}
 	}
 


Commit: 9a377abcebe2accace493ffaac5c623de4596474
    https://github.com/scummvm/scummvm/commit/9a377abcebe2accace493ffaac5c623de4596474
Author: elasota (ejlasota at gmail.com)
Date: 2022-06-26T14:55:15-04:00

Commit Message:
MTROPOLIS: Add widescreen mod GUIDs for Mac version

Changed paths:
    engines/mtropolis/hacks.cpp


diff --git a/engines/mtropolis/hacks.cpp b/engines/mtropolis/hacks.cpp
index a579011ea6c..3f44926f71d 100644
--- a/engines/mtropolis/hacks.cpp
+++ b/engines/mtropolis/hacks.cpp
@@ -92,7 +92,7 @@ void addObsidianImprovedWidescreen(const MTropolisGameDescription &desc, Hacks &
 
 			// 299 area (Cloud Ring)
 			0x178d5c,
-			0x178d5c,
+			0x177754,
 
 			// 300 area (light+phone)
 			0x4e0f86,
@@ -140,6 +140,74 @@ void addObsidianImprovedWidescreen(const MTropolisGameDescription &desc, Hacks &
 
 		Common::SharedPtr<StructuralHooks> invItemHooks(new ObsidianInventoryWindscreenHooks());
 
+		for (uint32 guid : inventoryItemGUIDs)
+			hacks.addStructuralHooks(guid, invItemHooks);
+	}
+	if ((desc.desc.flags & ADGF_DEMO) == 0 && desc.desc.language == Common::EN_ANY && desc.desc.platform == Common::kPlatformMacintosh) {
+		const uint32 inventoryItemGUIDs[] = {
+			// Bureau documents
+			// 100 area (booths)
+			0x4dfa22,
+			0x4e2d9e,
+
+			// 199 area (booths hint room)
+			0x4e2555,
+			0x4de654,
+
+			// 200 area (library)
+			0x4c83d2,
+			0x4c5802,
+
+			// 299 area (Cloud Ring)
+			0x178d5c,
+			0x177754,
+
+			// 300 area (light+phone)
+			0x4e0f86,
+			0x4e5107,
+
+			// 400 area (maze)
+			0x4e5528,
+			0x4e55cc,
+
+			// 500 area (Immediate Action)
+			0x4a2e7b,
+			0x4e0710,
+
+			// 800 area (bookshelves)
+			0x9914fb,
+			0x990f1f,
+
+			// 600 (sky face), 699 (mountain), and 700 (finale) have no document elements (player loses the documents)
+
+			// Bureau maze keycards
+			0x6035f,
+			0x62e24,
+			0x58d7f,
+			0x58212,
+
+			// Spider metal puzzle beaker
+			0x12fa7,
+
+			// Inspiration chip
+			// 100 area (Junkyard)
+			0x5f02e6,
+
+			// 200 area (Plane)
+			0x9bd5fc,
+
+			// 300 area (Piazza)
+			0x5ef979,
+
+			// 400 area (Church)
+			0xed9a8f,
+
+			// 500 area (Statue)
+			0x5ecdee,
+		};
+
+		Common::SharedPtr<StructuralHooks> invItemHooks(new ObsidianInventoryWindscreenHooks());
+
 		for (uint32 guid : inventoryItemGUIDs)
 			hacks.addStructuralHooks(guid, invItemHooks);
 	}