[Scummvm-git-logs] scummvm master -> 57207989ec8ac990e1480d8f149c547f3682d14a

[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:
57207989ec M4: RIDDLE: Start working on Room810 (preload, init, pre-parser)


Commit: 57207989ec8ac990e1480d8f149c547f3682d14a
    https://github.com/scummvm/scummvm/commit/57207989ec8ac990e1480d8f149c547f3682d14a
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-07T08:50:13+01:00

Commit Message:
M4: RIDDLE: Start working on Room810 (preload, init, pre-parser)

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


diff --git a/engines/m4/riddle/rooms/section8/room810.cpp b/engines/m4/riddle/rooms/section8/room810.cpp
index 8fc712d8cba..80bab4ac1cf 100644
--- a/engines/m4/riddle/rooms/section8/room810.cpp
+++ b/engines/m4/riddle/rooms/section8/room810.cpp
@@ -27,7 +27,57 @@ namespace M4 {
 namespace Riddle {
 namespace Rooms {
 
+void Room810::preload() {
+	LoadWSAssets("OTHER SCRIPT", _G(master_palette));
+
+	_G(player).walker_type = WALKER_ALT;
+	_G(player).shadow_type = SHADOW_ALT;
+}
+
 void Room810::init() {
+	digi_preload("950_s45", 950);
+	digi_preload("950_s29", 950);
+	digi_preload("810_s01", -1);
+	_ripleyTakesJadeSealFromTombSeries = series_load("RIPLEY TAKES JADE SEAL FROM TOMB", -1, nullptr);
+	_ripPos3LookAroundSeries = series_load("RIP POS 3 LOOK AROUND", -1, nullptr);
+	_ripTrekHandTalkPos3Series = series_load("RIP TREK HAND TALK POS3", -1, nullptr);
+	_810FireFlickerSeries = series_load("810 fire flicker", -1, nullptr);	
+	_810LitUrnSeries = series_load("810 lit urn", -1, nullptr);
+	_810MercSeries = series_load("810merc", -1, nullptr);
+	_810BlockSlidesOutSeries = series_load("810 block slides out", -1, nullptr);
+	series_load("810seal", -1, nullptr);
+	series_load("SAFARI SHADOW 3", -1, nullptr);
+	series_play("810 fire flicker", 1024, 0, -1, 12, -1, 100, 0, 0, 0, -1);
+	series_play("810 lit urn", 1024, 0, -1, 12, -1, 100, 0, 0, 0, -1);
+	_810SealMach = series_show_sprite("810seal", 0, 768);
+	digi_play_loop("950_s29", 3, 100, -1, 950);
+
+	if (_G(game).previous_room == KERNEL_RESTORING_GAME)
+		return;
+
+	_field0 = 0;
+	player_set_commands_allowed(false);
+	ws_demand_facing(_G(my_walker), 3);
+	ws_demand_location(_G(my_walker), 55, 318);	
+	ws_walk(_G(my_walker), 160, 318, nullptr, 1, 3, true);	
+}
+
+void Room810::pre_parser() {
+	const bool lookFl = player_said_any("look", "look at");
+
+	if (lookFl && player_said("mausoleum")) {
+		digi_play("810r02", 1, 255, -1, 810);
+		_G(player).need_to_walk = false;
+		_G(player).ready_to_walk = true;
+		_G(player).waiting_for_walk = false;
+	} else if (lookFl && player_said(" ")) {
+		_G(player).need_to_walk = false;
+		_G(player).ready_to_walk = true;
+		_G(player).waiting_for_walk = false;
+	}
+}
+
+void Room810::parser() {
 }
 
 void Room810::daemon() {
diff --git a/engines/m4/riddle/rooms/section8/room810.h b/engines/m4/riddle/rooms/section8/room810.h
index 0ff6c07f023..1a298a80ec8 100644
--- a/engines/m4/riddle/rooms/section8/room810.h
+++ b/engines/m4/riddle/rooms/section8/room810.h
@@ -33,8 +33,24 @@ public:
 	Room810() : Room() {}
 	~Room810() override {}
 
+	void preload() override;
 	void init() override;
+	void pre_parser() override;
+	void parser() override;
 	void daemon() override;
+
+private:
+	int32 _field0 = 0;
+
+	int32 _810BlockSlidesOutSeries = 0;
+	int32 _810FireFlickerSeries = 0;
+	int32 _810LitUrnSeries = 0;
+	int32 _810MercSeries = 0;
+	int32 _ripleyTakesJadeSealFromTombSeries = 0;
+	int32 _ripPos3LookAroundSeries = 0;
+	int32 _ripTrekHandTalkPos3Series = 0;
+
+	machine *_810SealMach = nullptr;
 };
 
 } // namespace Rooms