[Scummvm-git-logs] scummvm master -> 2581d4f652d0a37379046df34ac59d2633cdb665

Strangerke noreply at scummvm.org
Sun Dec 8 23:54:15 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:
2581d4f652 M4: RIDDLE: room 705: Implement conv705a and conv705b


Commit: 2581d4f652d0a37379046df34ac59d2633cdb665
    https://github.com/scummvm/scummvm/commit/2581d4f652d0a37379046df34ac59d2633cdb665
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-09T00:54:04+01:00

Commit Message:
M4: RIDDLE: room 705: Implement conv705a and conv705b

Changed paths:
    engines/m4/riddle/rooms/section7/room705.cpp


diff --git a/engines/m4/riddle/rooms/section7/room705.cpp b/engines/m4/riddle/rooms/section7/room705.cpp
index 854382854bb..bcc2249b8df 100644
--- a/engines/m4/riddle/rooms/section7/room705.cpp
+++ b/engines/m4/riddle/rooms/section7/room705.cpp
@@ -1193,11 +1193,39 @@ void Room705::daemon() {
 }
 
 void Room705::conv705a() {
-	//TODO Not yet implemented
+	if (conv_sound_to_play() == nullptr) {
+		conv_resume(conv_get_handle());
+		return;
+	}
+
+	const int32 who = conv_whos_talking();
+	if (who == 0) {
+		_field64_should = 121;
+		_G(kernel).trigger_mode = KT_DAEMON;
+		kernel_timing_trigger(10, 127, nullptr);
+		_G(kernel).trigger_mode = KT_PARSE;
+	} else if (who == 1) {
+		digi_play(conv_sound_to_play(), 1, 255, 90, -1);
+	}
+
 }
 
 void Room705::conv705b() {
-	//TODO Not yet implemented
+	if (conv_sound_to_play() == nullptr) {
+		conv_resume(conv_get_handle());
+		return;
+	}
+
+	const int32 who = conv_whos_talking();
+	if (who == 0) {
+		_field64_should = 131;
+		_G(kernel).trigger_mode = KT_DAEMON;
+		kernel_timing_trigger(10, 137, nullptr);
+		_G(kernel).trigger_mode = KT_PARSE;
+	} else if (who == 1) {
+		digi_play(conv_sound_to_play(), 1, 255, 93, -1);
+	}
+
 }
 
 void Room705::playCheckBrochureAnim(int32 trigger, const char *digiName) {




More information about the Scummvm-git-logs mailing list