[Scummvm-git-logs] scummvm master -> 8fc5cc1d18c1e35952f09a7798bbe2a22976fbf5

[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:
8fc5cc1d18 M4: RIDDLE: Finish the implementation of Room811


Commit: 8fc5cc1d18c1e35952f09a7798bbe2a22976fbf5
    https://github.com/scummvm/scummvm/commit/8fc5cc1d18c1e35952f09a7798bbe2a22976fbf5
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-10T00:16:42+01:00

Commit Message:
M4: RIDDLE: Finish the implementation of Room811

Changed paths:
    engines/m4/riddle/rooms/section8/room811.cpp
    engines/m4/riddle/rooms/section8/room811.h


diff --git a/engines/m4/riddle/rooms/section8/room811.cpp b/engines/m4/riddle/rooms/section8/room811.cpp
index b57361c1745..3ab79c083d4 100644
--- a/engines/m4/riddle/rooms/section8/room811.cpp
+++ b/engines/m4/riddle/rooms/section8/room811.cpp
@@ -38,7 +38,7 @@ void Room811::preload() {
 void Room811::init() {
 	interface_hide();
 	player_set_commands_allowed(false);
-	_field0 = 80;
+	_811MusicFadingVol = 80;
 	digi_stop(1);
 	digi_preload("950_s45", 950);
 	digi_play_loop("950_s45", 3, 80, -1, 950);
@@ -303,21 +303,97 @@ void Room811::daemon() {
 		break;
 
 	case 35:
+		digi_play("811b10", 2, 255, 36, -1);
+		sendWSMessage_10000(1, _811Pu01Mach, _811EndSeries, 61, 61, -1, _811EndSeries, 61, 63, 4);
+		sendWSMessage_1a0000(_811Pu01Mach, 11);
+
+		break;
+
 	case 36:
+		sendWSMessage_10000(1, _811Pu01Mach, _811EndSeries, 64, 73, 65, _811EndSeries, 73, 73, 0);
+		break;
+
 	case 37:
+		digi_play("811r08", 2, 255, 91, -1);
+		break;
+
 	case 40:
+		digi_play("811_s06", 1, 255, 37, -1);
+		break;
+
 	case 64:
+		sendWSMessage_10000(1, _811Pu01Mach, _811EndSeries, 58, 60, 35, _811EndSeries, 60, 60, 0);
+		digi_play("811_s03", 1, 255, -1, -1);
+
+		break;
+
 	case 65:
+		sendWSMessage_10000(1, _811Pu01Mach, _811EndSeries, 74, 87, -1, _811EndSeries, 87, 87, 0);
+		digi_play("811_s04", 1, 255, -1, -1);
+		kernel_timing_trigger(55, 40, nullptr);
+
+		break;
+
 	case 76:
+		digi_play("811_s01", 1, 220, -1, -1);
+		break;
+
 	case 77:
+		digi_play("811_s01", 1, 255, -1, -1);
+		break;
+
 	case 82:
+		sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 12, 0);
+		kernel_timing_trigger(15, 83, nullptr);
+
+		break;
+
 	case 83:
+		sendWSMessage_10000(1, _811BaronMach, _811BA04Series, 1, 17, -1, _811BA01Series, 12, 17, 4);
+		sendWSMessage_1a0000(_811BaronMach, 11);
+		digi_play("811B09A", 2, 255, 84, -1);
+
+		break;
+
 	case 84:
+		sendWSMessage_10000(1, _811BaronMach, _811BA01Series, 12, 12, -1, _811BA01Series, 12, 12, 0);
+		kernel_timing_trigger(20, 32, nullptr);
+
+		break;
+
 	case 91:
+		player_set_commands_allowed(false);
+		adv_kill_digi_between_rooms(false);
+		disable_player_commands_and_fade_init(92);
+		digi_stop(1);
+		digi_stop(2);
+
+		break;
+
 	case 92:
+		digi_play_loop("950_s45", 3, 128, -1, 950);
+		_G(game).new_room = 861;
+		break;
+
 	case 1050:
+		_811MusicFadingVol -= 5;
+		if (_811MusicFadingVol <= 0) {
+			digi_stop(1);
+		} else {
+			digi_change_panning(1, _811MusicFadingVol);
+			kernel_timing_trigger(2, 1050, nullptr);
+		}
+
+		break;
+
 	case 1100:
+		digi_play("811_s01a", 1, 255, -1, -1);
+		break;
+
 	case 1110:
+		digi_play("811_s01b", 1, 255, -1, -1);
+		break;
+
 	default:
 		break;
 	}
diff --git a/engines/m4/riddle/rooms/section8/room811.h b/engines/m4/riddle/rooms/section8/room811.h
index 11bb93fac4f..5824b218ea7 100644
--- a/engines/m4/riddle/rooms/section8/room811.h
+++ b/engines/m4/riddle/rooms/section8/room811.h
@@ -40,7 +40,7 @@ public:
 	void daemon() override;
 
 private:
-	int32 _field0 = 0;
+	int32 _811MusicFadingVol = 0;
 
 	int32 _811BA01Series = 0;
 	int32 _811BA02Series = 0;
@@ -49,12 +49,12 @@ private:
 	int32 _811BA05Series = 0;
 	int32 _811MC01Series = 0;
 	int32 _811RP01Series = 0;
+	int32 _811EndSeries;
 
 	machine *_811BaronMach = nullptr;
 	machine *_811McMach = nullptr;
 	machine *_811Pu01Mach = nullptr;
 	machine *_811RipleyMach = nullptr;
-	int32 _811EndSeries;
 };
 
 } // namespace Rooms