[Scummvm-git-logs] scummvm master -> 43b43f6f01cf23ee331db92e5dbbc7b9c100fd07

[dreammaster]

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:
43b43f6f01 MADS: PHANTOM: Fix looking at lens items in inventory


Commit: 43b43f6f01cf23ee331db92e5dbbc7b9c100fd07
    https://github.com/scummvm/scummvm/commit/43b43f6f01cf23ee331db92e5dbbc7b9c100fd07
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-05-12T16:10:24+10:00

Commit Message:
MADS: PHANTOM: Fix looking at lens items in inventory

Changed paths:
    engines/mads/madsv2/phantom/phantom.cpp
    engines/mads/madsv2/phantom/phantom.h


diff --git a/engines/mads/madsv2/phantom/phantom.cpp b/engines/mads/madsv2/phantom/phantom.cpp
index 0c4fb13efe0..dde1c9c8139 100644
--- a/engines/mads/madsv2/phantom/phantom.cpp
+++ b/engines/mads/madsv2/phantom/phantom.cpp
@@ -579,7 +579,7 @@ void PhantomEngine::global_parser_code() {
 
 
 	if (player_said_1(look) && player_has(object_named(player_main_noun))) {
-		object_examine(oar, text_008_24, 0);
+		lookAtLens();
 		goto handled;
 	}
 
@@ -658,6 +658,37 @@ done:
 	;
 }
 
+void PhantomEngine::lookAtLens() {
+	int16 obj = object_named(player_main_noun);
+
+	if (player_parse(3, 123, 0)) {
+		object_examine(obj, global[current_year] == 1993 ? 802 : 842, 0);
+		return;
+	}
+	if (player_parse(3, 163, 0)) {
+		object_examine(obj, global[current_year] == 1993 ? 804 : 843, 0);
+		return;
+	}
+	if (player_parse(3, 23, 0)) {
+		object_examine(obj, global[current_year] == 1993 ? 817 : 844, 0);
+		return;
+	}
+	if (player_parse(3, 77, 0)) {
+		object_examine(obj, global[current_year] == 1993 ? 819 : 845, 0);
+		return;
+	}
+	if (player_parse(3, 87, 0)) {
+		object_examine(1, global[lantern_status] == 1 ? 831 : 801, 0);
+		return;
+	}
+	if (player_parse(3, 131, 0)) {
+		object_examine(6, 846, 0);
+		return;
+	}
+
+	object_examine(obj, obj + 800, 0);
+}
+
 void PhantomEngine::global_error_code() {
 	int show_me = 0;
 	int item;
diff --git a/engines/mads/madsv2/phantom/phantom.h b/engines/mads/madsv2/phantom/phantom.h
index 58442f1b0d4..524bf226fb4 100644
--- a/engines/mads/madsv2/phantom/phantom.h
+++ b/engines/mads/madsv2/phantom/phantom.h
@@ -33,6 +33,7 @@ private:
 	static void global_object_sprite();
 	static void stop_walker_basic();
 	static void stop_walker_tricks();
+	void lookAtLens();
 
 public:
 	PhantomEngine(OSystem *syst, const MADSGameDescription *gameDesc) :