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

[Strangerke]

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:
d828ad2dde M4: RIDDLE: room 702 - Implement conv702a


Commit: d828ad2dde1317cce620c583fc421fe0b7612d70
    https://github.com/scummvm/scummvm/commit/d828ad2dde1317cce620c583fc421fe0b7612d70
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-11-24T23:02:07+01:00

Commit Message:
M4: RIDDLE: room 702 - Implement conv702a

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


diff --git a/engines/m4/riddle/rooms/section7/room702.cpp b/engines/m4/riddle/rooms/section7/room702.cpp
index 814c6db2b8e..3397c3a8611 100644
--- a/engines/m4/riddle/rooms/section7/room702.cpp
+++ b/engines/m4/riddle/rooms/section7/room702.cpp
@@ -677,7 +677,25 @@ void Room702::callback(frac16 myMessage, machine *sender) {
 }
 
 void Room702::conv702a() {
-	//TODO
+	if (conv_sound_to_play() == nullptr) {
+		conv_resume(conv_get_handle());
+		return;
+	}
+
+	int32 who = conv_whos_talking();
+	if (who == 0) {
+		int32 node = conv_current_node();
+		int32 entry = conv_current_entry();
+
+		if (node == 1 && (entry == 1 || entry == 2)) {
+			_field54 = 2107;
+		} else {
+			_field54 = 2103;
+		}
+	} else if (who == 1) {
+		_field48 = 1104;
+		digi_play(conv_sound_to_play(), 1, 255, 1, -1);
+	}
 }
 
 } // namespace Rooms