[Scummvm-git-logs] scummvm master -> 5a671fc772b36915510fca26f6b0fafd03566009

[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:
5a671fc772 M4: RIDDLE: Room 711: Start working on room 711 (preload, init, daemon)


Commit: 5a671fc772b36915510fca26f6b0fafd03566009
    https://github.com/scummvm/scummvm/commit/5a671fc772b36915510fca26f6b0fafd03566009
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-28T07:51:50+01:00

Commit Message:
M4: RIDDLE: Room 711: Start working on room 711 (preload, init, daemon)

Changed paths:
    engines/m4/riddle/rooms/section7/room711.cpp
    engines/m4/riddle/rooms/section7/room711.h


diff --git a/engines/m4/riddle/rooms/section7/room711.cpp b/engines/m4/riddle/rooms/section7/room711.cpp
index 2c55e30dc2f..7df946da68c 100644
--- a/engines/m4/riddle/rooms/section7/room711.cpp
+++ b/engines/m4/riddle/rooms/section7/room711.cpp
@@ -27,10 +27,52 @@ namespace M4 {
 namespace Riddle {
 namespace Rooms {
 
+void Room711::preload() {
+	_G(player).walker_type = WALKER_ALT;
+	_G(player).shadow_type = SHADOW_ALT;
+	LoadWSAssets("OTHER SCRIPT", _G(master_palette));
+}
+
 void Room711::init() {
+	digi_preload("711R03", -1);
+	if (_G(flags[V224])) {
+		hotspot_set_active(_G(currentSceneDef).hotspots, "MASTER LU'S BOOK", false);
+		hotspot_set_active(_G(currentSceneDef).hotspots, "SIKKIMESE LU'S BOOK", false);
+	}
+
+	if (_G(game).previous_room == 710) {
+		_711Rp01Series = series_load("711RP01", -1, nullptr);
+		ws_demand_location(_G(my_walker), 245, 354);
+		ws_demand_facing(_G(my_walker), 9);
+		ws_hide_walker(_G(my_walker));
+		kernel_timing_trigger(10, 100, nullptr);
+	}
+}
+
+void Room711::pre_parser() {
+	// No Implementation
+}
+
+void Room711::parser() {
+	// TODO No implementation yet
 }
 
 void Room711::daemon() {
+	switch (_G(kernel).trigger) {
+	case 100:
+		series_play("711RP01", 0, 0, 101, 0, 0, 100, 0, 0, 0, -1);
+		break;
+
+	case 101:
+		series_unload(_711Rp01Series);
+		player_set_commands_allowed(true);
+		ws_unhide_walker(_G(my_walker));
+
+		break;
+
+	default:
+		break;
+	}
 }
 
 } // namespace Rooms
diff --git a/engines/m4/riddle/rooms/section7/room711.h b/engines/m4/riddle/rooms/section7/room711.h
index 541d0159978..547f9847580 100644
--- a/engines/m4/riddle/rooms/section7/room711.h
+++ b/engines/m4/riddle/rooms/section7/room711.h
@@ -33,8 +33,14 @@ public:
 	Room711() : Room() {}
 	~Room711() override {}
 
+	void preload() override;
 	void init() override;
+	void pre_parser() override;
+	void parser() override;
 	void daemon() override;
+
+private:
+	int32 _711Rp01Series = 0;
 };
 
 } // namespace Rooms