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

[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:
ee72182970 M4: RIDDLE: Implement room 834 as a Sector8Room


Commit: ee72182970f53f7c6bc5c82fae9f956b1ab4981b
    https://github.com/scummvm/scummvm/commit/ee72182970f53f7c6bc5c82fae9f956b1ab4981b
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-10-17T00:10:07+01:00

Commit Message:
M4: RIDDLE: Implement room 834 as a Sector8Room

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


diff --git a/engines/m4/riddle/rooms/section8/room834.cpp b/engines/m4/riddle/rooms/section8/room834.cpp
index 592ca42dd81..5933b0041bf 100644
--- a/engines/m4/riddle/rooms/section8/room834.cpp
+++ b/engines/m4/riddle/rooms/section8/room834.cpp
@@ -21,6 +21,7 @@
 
 #include "m4/riddle/rooms/section8/room834.h"
 #include "m4/graphics/gr_series.h"
+#include "m4/riddle/riddle.h"
 #include "m4/riddle/vars.h"
 
 namespace M4 {
@@ -28,9 +29,83 @@ namespace Riddle {
 namespace Rooms {
 
 void Room834::init() {
-}
+	_currentRoom = 834;
+	if (_G(flags)[V276] == 0) {
+		ws_walk_load_walker_series(S8_SHADOW_DIRS1, S8_SHADOW_NAMES1, false);
+		ws_walk_load_walker_series(S8_SHADOW_DIRS2, S8_SHADOW_NAMES2, false);
+	}
+
+	series_plain_play("834fire1", -1, 0, 100, 32767, 7, -1, false);
+	series_plain_play("834fire2", -1, 0, 100, 32767, 7, -1, false);
+	series_plain_play("834fire3", -1, 0, 100, 32767, 7, -1, false);
+	_var1 = 4;
+	_var2 = 2;
+	_var3 = 3;
+	_var4 = 5;
+	_var5 = 7;
+
+	getSeriesName(2, false);
+	_machArr[0] = series_play(_currentSeriesName.c_str(), 767, 16, -1, 0, 0, 100, 0, 0, 0, -1);
+	getSeriesName(3, false);
+	_machArr[1] = series_play(_currentSeriesName.c_str(), 767, 16, -1, 0, 0, 100, 0, 0, 0, -1);
+	getSeriesName(6, false);
+	_machArr[2] = series_play(_currentSeriesName.c_str(), 767, 16, -1, 0, 0, 100, 0, 0, 0, -1);
+	getSeriesName(7, false);
+	_machArr[3] = series_play(_currentSeriesName.c_str(), 767, 16, -1, 0, 0, 100, 0, 0, 0, -1);
+
+	hotspot_set_active(_G(currentSceneDef).hotspots, "MEI CHEN", false);
+	hotspot_set_active(_G(currentSceneDef).hotspots, "MEI CHEN ", false);
+	hotspot_set_active(_G(currentSceneDef).hotspots, "MEI CHEN  ", false);
+	hotspot_set_active(_G(currentSceneDef).hotspots, "MEI CHEN   ", false);
+	hotspot_set_active(_G(currentSceneDef).hotspots, "MEI CHEN    ", false);
+
+	switch (_G(game).previous_room) {
+	case KERNEL_RESTORING_GAME:
+		player_set_commands_allowed(true);
+		digi_preload("950_s29", -1);
+		if (_G(flags)[V276] == 0) {
+			_mcTrekMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, _guessX, 400, _guessIndex, Walker::player_walker_callback, "mc_trek");
+			kernel_timing_trigger(1, 1, nullptr);
+		}
+		break;
+
+	case 803:
+		player_set_commands_allowed(false);
+		ws_demand_facing(_G(my_walker), 3);
+		ws_demand_location(_G(my_walker), -10, 330);
+		if (_G(flags)[V276] == 0) {
+			_mcTrekMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, -50, 330, 2, Walker::player_walker_callback, "mc_trek");
+			_field70 = 0;
+			_guessX = 100;
+			_guessIndex = 1;
+			ws_walk(_G(my_walker), 150, 355, nullptr, -1, 3, true);
+			ws_walk(_mcTrekMach, 80, 400, nullptr, 1, 1, true);
+		} else {
+			ws_walk(_G(my_walker), 150, 355, nullptr, 1, 3, true);
+		}
+		break;
+	default:
+		player_set_commands_allowed(false);
+		moveScreen(1280, 0);
+		ws_demand_facing(_G(my_walker), 9);
+		ws_demand_location(_G(my_walker), 1925, 330);
+		if (_G(flags)[V276] == 0) {
+			_mcTrekMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, 2000, 330, 9, Walker::player_walker_callback, "mc_trek");
+			_field70 = 4;
+			_guessX = 1815;
+			_guessIndex = 11;
+			ws_walk(_G(my_walker), 1765, 348, nullptr, 0, 9, true);
+			DisposePath(_mcTrekMach->walkPath);
+			_mcTrekMach->walkPath = CreateCustomPath(1836, 329, 1815, 400, 0xffff);
+			ws_custom_walk(_mcTrekMach, 11, 1, true);
+		} else {
+			ws_walk(_G(my_walker), 1765, 348, nullptr, 1, 9, true);
+		}
+
+		break;
+	}
 
-void Room834::daemon() {
+	digi_play_loop("950_s29", 3, 96, -1, -1);
 }
 
 } // namespace Rooms
diff --git a/engines/m4/riddle/rooms/section8/room834.h b/engines/m4/riddle/rooms/section8/room834.h
index ca1dc278102..5c97a139d6f 100644
--- a/engines/m4/riddle/rooms/section8/room834.h
+++ b/engines/m4/riddle/rooms/section8/room834.h
@@ -22,19 +22,18 @@
 #ifndef M4_RIDDLE_ROOMS_SECTION8_ROOM834_H
 #define M4_RIDDLE_ROOMS_SECTION8_ROOM834_H
 
-#include "m4/riddle/rooms/room.h"
+#include "m4/riddle/rooms/section8/section8_room.h"
 
 namespace M4 {
 namespace Riddle {
 namespace Rooms {
 
-class Room834 : public Room {
+class Room834 : public Section8Room {
 public:
-	Room834() : Room() {}
+	Room834() : Section8Room() {}
 	~Room834() override {}
 
 	void init() override;
-	void daemon() override;
 };
 
 } // namespace Rooms