[Scummvm-git-logs] scummvm master -> 23b8e7a46bed1d7922100c3f3cb97a6a3fffdcd9

Strangerke noreply at scummvm.org
Tue Jul 1 19:32:36 UTC 2025


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:
23b8e7a46b M4: RIDDLE: Partial fix for bug #16065 in room 204 - Fix multiple descriptions


Commit: 23b8e7a46bed1d7922100c3f3cb97a6a3fffdcd9
    https://github.com/scummvm/scummvm/commit/23b8e7a46bed1d7922100c3f3cb97a6a3fffdcd9
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-07-01T20:32:28+01:00

Commit Message:
M4: RIDDLE: Partial fix for bug #16065 in room 204 - Fix multiple descriptions

Changed paths:
    engines/m4/riddle/rooms/section2/room204.cpp


diff --git a/engines/m4/riddle/rooms/section2/room204.cpp b/engines/m4/riddle/rooms/section2/room204.cpp
index f751dd769d4..ddb7d95e4d3 100644
--- a/engines/m4/riddle/rooms/section2/room204.cpp
+++ b/engines/m4/riddle/rooms/section2/room204.cpp
@@ -36,6 +36,16 @@ const int16 ROOM204_SHADOW_DIRS[] = { 210, -1};
 static const char *ROOM204_NORMAL_NAMES[] = { "priest walker" };
 static const char *ROOM204_SHADOW_NAMES[] = { "kuangs shadow 2" };
 
+static const char *const SAID[][2] = {
+	{"ZHENMU SHOU FIGURINE", "204r27"},
+	{"BRONZE LANTERN", "204r07"},
+	{"PAGODA", "204r08"},
+	{"GIANT URN", "204r09"},
+	{"ACOLYTE", "204r12"},
+	{"YOUNG PRIEST", "204r13"},
+	{"FOO DOG", "204r28"},
+	{nullptr, nullptr}
+};
 
 void Room204::preload() {
 	_G(player).walker_type = WALKER_ALT;
@@ -605,7 +615,7 @@ void Room204::parser() {
 		goto done;
 	}
 
-	if (lookFl && player_said("ZHENMU SHOU FIGURINE")) {
+	if (lookFl && _G(walker).ripley_said(SAID)) {
 		goto done;
 	}
 




More information about the Scummvm-git-logs mailing list