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

Strangerke noreply at scummvm.org
Mon Nov 18 11:02:32 UTC 2024


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

Summary:
cd8fb32503 M4: RIDDLE: Room 204 - Finish the implementation of parser


Commit: cd8fb325039d121a66c7e45ce1442391eece0894
    https://github.com/scummvm/scummvm/commit/cd8fb325039d121a66c7e45ce1442391eece0894
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-11-18T12:01:28+01:00

Commit Message:
M4: RIDDLE: Room 204 - Finish the implementation of parser

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 c07c7804be1..60ad9b10873 100644
--- a/engines/m4/riddle/rooms/section2/room204.cpp
+++ b/engines/m4/riddle/rooms/section2/room204.cpp
@@ -996,9 +996,26 @@ void Room204::parser() {
 		goto done;
 	} // talkFl && player_said("MEI CHEN")
 
-
-
-	warning("incomplete");
+	if (talkFl && player_said("ACOLYTE"))
+		digi_play("204R51", 1, 255, -1, -1);
+	else if (player_said("US DOLLARS", "ACOLYTE") || player_said("US DOLLARS", "YOUNG PRIEST"))
+		digi_play("204R24", 1, 255, -1, -1);
+	else if (player_said("CHINESE YUAN", "ACOLYTE") || player_said("CHINESE YUAN", "YOUNG PRIEST"))
+		digi_play("204R25", 1, 255, -1, -1);
+	else if (player_said("journal") && !takeFl && !esi && !inv_player_has(_G(player).noun)) {
+		if (_G(flags[kTabletsCartoon]) != 0) {
+			digi_play("204R15", 1, 255, -1, -1);
+		} else {
+			if (_G(kernel).trigger == 6) {
+				_G(flags[V089]) = 1;
+				_G(flags[kTabletsCartoon]) = 1;
+			}
+			warning("Room204 Parser : sendWSMessage_multi(nullptr)");
+		}
+	} else if (esi && !inv_player_has(_G(player).noun) && !player_said("MEI CHEN"))
+		digi_play("204R06", 1, 255, -1, -1);
+	else
+		return;
 
 done:
 	_G(player).command_ready = false;




More information about the Scummvm-git-logs mailing list