[Scummvm-git-logs] scummvm master -> 0547070491ef1f0ab953959c49fb798eaeab225e

[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:
0547070491 M4: RIDDLE: Implementaton of Room818


Commit: 0547070491ef1f0ab953959c49fb798eaeab225e
    https://github.com/scummvm/scummvm/commit/0547070491ef1f0ab953959c49fb798eaeab225e
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-10T01:01:57+01:00

Commit Message:
M4: RIDDLE: Implementaton of Room818

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


diff --git a/engines/m4/riddle/rooms/section8/room818.cpp b/engines/m4/riddle/rooms/section8/room818.cpp
index b5c5dd9a389..ceee9b17d73 100644
--- a/engines/m4/riddle/rooms/section8/room818.cpp
+++ b/engines/m4/riddle/rooms/section8/room818.cpp
@@ -27,10 +27,120 @@ namespace M4 {
 namespace Riddle {
 namespace Rooms {
 
+void Room818::preload() {
+	_G(player).walker_in_this_scene = false;
+	LoadWSAssets("other script", _G(master_palette));
+
+	_G(player).walker_type = WALKER_ALT;
+	_G(player).shadow_type = SHADOW_ALT;
+}
+
 void Room818::init() {
+	player_set_commands_allowed(false);
+	interface_hide();
+	digi_preload("950_s45", 950);
+	digi_play_loop("950_s45", 3, 100, -1, 950);
+
+	if (inv_object_in_scene("CRANK", 808)) {
+		series_show("808 HANDLE SPRITE", 3840, 16, -1, -1, 0, 100, 0, 0);
+	}
+
+	series_play("818merc", 3840, 0, -1, 7, -1, 100, 0, 0, 0, -1);
+	series_play("818fire", 3840, 0, -1, 5, -1, 100, 0, 0, 0, -1);
+	series_play("818baron", 256, 0, -1, 10, -1, 100, 0, 0, 0, -1);
+	_818All1Series = series_load("818all1", -1, nullptr);
+	_xMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 256, 0, triggerMachineByHashCallback, "x");
+	sendWSMessage_10000(1, _xMach, _818All1Series, 1, 148, 5, _818All1Series, 148, 148, 4);
+}
+
+void Room818::pre_parser() {
+	// Nothing
+}
+
+void Room818::parser() {
+	// Nothing
 }
 
 void Room818::daemon() {
+	int32 edx = _dword1A18DC + 1;
+	switch (_G(kernel).trigger) {
+	case 1:
+		player_set_commands_allowed(true);
+		break;
+
+	case 5:
+		_dword1A18DC = 0;
+		digi_play("818_s01", 1, 255, 10, 818);
+		sendWSMessage_10000(1, _xMach, _818All1Series, 149, 179, 10, _818All1Series, 179, 179, 4);
+
+		break;
+
+	case 10:
+		if (_dword1A18DC != 0) {
+			_dword1A18DC = 0;
+			sendWSMessage_10000(1, _xMach, _818All1Series, 179, 197, 15, _818All1Series, 187, 194, 1);
+			digi_play("808r41", 1, 255, 15, -1);
+		} else {
+			_dword1A18DC = edx;
+		}
+
+		break;
+
+	case 15:
+		if (_dword1A18DC != 0) {
+			_dword1A18DC = 0;
+			sendWSMessage_10000(1, _xMach, _818All1Series, 195, 218, 20, _818All1Series, 218, 218, 0);
+		} else {
+			_dword1A18DC = edx;
+		}
+
+		break;
+
+	case 20:
+		sendWSMessage_10000(1, _xMach, _818All1Series, 218, 240, 22, _818All1Series, 240, 240, 0);
+		digi_play("808m10", 1, 255, 22, -1);
+
+		break;
+
+	case 22:
+		if (_dword1A18DC != 0) {
+			_dword1A18DC = 0;
+			sendWSMessage_10000(1, _xMach, _818All1Series, 242, 269, 23, _818All1Series, 263, 269, 1);
+			digi_play("808r42", 1, 255, 23, -1);
+		} else {
+			_dword1A18DC = edx;
+		}
+
+		break;
+
+	case 23:
+		if (_dword1A18DC != 0) {
+			_dword1A18DC = 0;
+			sendWSMessage_10000(1, _xMach, _818All1Series, 270, 300, 25, _818All1Series, 300, 300, 1);
+		} else {
+			_dword1A18DC = edx;
+		}
+
+		break;
+
+	case 25:
+		sendWSMessage_10000(1, _xMach, _818All1Series, 301, 328, 30, _818All1Series, 328, 328, 1);
+		disable_player_commands_and_fade_init(-1);
+		midi_fade_volume(0, 70);
+		kernel_timing_trigger(70, 30, nullptr);
+
+		break;
+
+	case 30:
+		_G(game).new_section = 9;
+		_G(game).new_room = 917;
+
+		break;
+
+	default:
+		break;
+
+	}
 }
 
 } // namespace Rooms
diff --git a/engines/m4/riddle/rooms/section8/room818.h b/engines/m4/riddle/rooms/section8/room818.h
index 634f8bfd5e3..b743456caff 100644
--- a/engines/m4/riddle/rooms/section8/room818.h
+++ b/engines/m4/riddle/rooms/section8/room818.h
@@ -33,8 +33,19 @@ public:
 	Room818() : Room() {}
 	~Room818() override {}
 
+	void preload() override;
 	void init() override;
+	void pre_parser() override;
+	void parser() override;
 	void daemon() override;
+
+private:
+	int32 _dword1A18DC = 0;
+
+	int32 _818All1Series = 0;
+
+	machine *_xMach = nullptr;
+
 };
 
 } // namespace Rooms