[Scummvm-git-logs] scummvm master -> 186463717e11e8af751457c870f633f1ca76d146

[dreammaster]

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:
186463717e M4: RIDDLE: Ending sequence fixes


Commit: 186463717e11e8af751457c870f633f1ca76d146
    https://github.com/scummvm/scummvm/commit/186463717e11e8af751457c870f633f1ca76d146
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-09T21:44:58-08:00

Commit Message:
M4: RIDDLE: Ending sequence fixes

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


diff --git a/engines/m4/riddle/rooms/section8/room860.cpp b/engines/m4/riddle/rooms/section8/room860.cpp
index 243ae55ccb2..1102b53990b 100644
--- a/engines/m4/riddle/rooms/section8/room860.cpp
+++ b/engines/m4/riddle/rooms/section8/room860.cpp
@@ -63,14 +63,6 @@ void Room860::init() {
 	sendWSMessage_10000(1, _860RipMach, _860RipCrossSeries, 1, 20, 80, _860RipCrossSeries, 20, 20, 0);
 	_860McMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 768, false, triggerMachineByHashCallback, "860 mc");
 	sendWSMessage_10000(1, _860McMach, _860MeiTalkSeries, 1, 1, -1, _860MeiTalkSeries, 1, 1, 0);
-	}
-
-void Room860::pre_parser() {
-	// Nothing
-}
-
-void Room860::parser() {
-	// Nothing
 }
 
 void Room860::daemon() {
@@ -79,70 +71,64 @@ void Room860::daemon() {
 		digi_stop(1);
 		series_load("860SHLD", -1, nullptr);
 		series_place_sprite("860SHLD", 0, 0, 0, 100, 512);
-		sendWSMessage_10000(1, _860RipMach, _860RipWalkSeries, 1, 100, 2, _860RipWalkSeries, 1, 1, 0);
+		sendWSMessage_10000(1, _860RipMach, _860RipWalkSeries, 1, 100, 2,
+			_860RipWalkSeries, 1, 1, 0);
 		sendWSMessage_190000(_860RipMach, 3);
 		g_engine->set_camera_delta_pan(-290, 0);
 		series_unload(_860RipCrossSeries);
-
 		break;
 
 	case 2:
-		series_unload(_860RipWalkSeries);
-		sendWSMessage_10000(1, _860McMach, _860MeiTalkSeries, 1, 1, -1, _860MeiTalkSeries, 1, 11, 4);
+		sendWSMessage_10000(1, _860McMach, _860MeiTalkSeries, 1, 1, -1,
+			_860MeiTalkSeries, 1, 11, 4);
 		digi_play("860m01", 2, 255, 3, 860);
-
 		break;
 
 	case 3:
-		sendWSMessage_10000(1, _860McMach, _860MeiTalkSeries, 11, 11, -1, _860MeiTalkSeries, 11, 11, 0);
-		sendWSMessage_10000(1, _860RipMach, _860RipTalkSeries, 1, 2, -1, _860RipTalkSeries, 1, 2, 4);
+		series_unload(_860RipWalkSeries);
+		sendWSMessage_10000(1, _860McMach, _860MeiTalkSeries, 11, 11, -1,
+			_860MeiTalkSeries, 11, 11, 0);
+		sendWSMessage_10000(1, _860RipMach, _860RipTalkSeries, 1, 2, -1,
+			_860RipTalkSeries, 1, 2, 4);
 		digi_play("860r01", 2, 255, 4, 860);
-
 		break;
 
 	case 4:
 		sendWSMessage_10000(1, _860RipMach, _860RipTalkSeries, 1, 6, -1, _860RipTalkSeries, 6, 6, 0);
 		sendWSMessage_10000(1, _860McMach, _860MeiTalkSeries, 12, 26, -1, _860MeiTalkSeries, 26, 26, 0);
 		kernel_timing_trigger(25, 5, nullptr);
-
 		break;
 
 	case 5:
 		digi_play("860m02", 2, 255, -1, 860);
-		kernel_timing_trigger(60, 5, nullptr);
-
+		kernel_timing_trigger(60, 6, nullptr);
 		break;
 
 	case 6:
 		sendWSMessage_10000(1, _860McMach, _860MeiTalkSeries, 26, 26, -1, _860MeiTalkSeries, 26, 26, 0);
 		digi_play("860r02", 2, 255, 7, -1);
 		sendWSMessage_10000(1, _860RipMach, _860RipTalkSeries, 1, 2, -1, _860RipTalkSeries, 1, 2, 4);
-
 		break;
 
 	case 7:
 		sendWSMessage_10000(1, _860McMach, _860MeiTalkSeries, 27, 32, 91, _860MeiTalkSeries, 32, 32, 0);
 		sendWSMessage_10000(1, _860RipMach, _860RipTalkSeries, 6, 6, -1, _860RipTalkSeries, 6, 6, 0);
-
 		break;
 
 	case 80:
 		sendWSMessage_10000(1, _860RipMach, _860RipCrossSeries, 21, 164, 1, _860RipWalkSeries, 1, 1, 0);
 		digi_play_loop("809_s04", 1, 200, -1, 809);
-
 		break;
 
 	case 91:
 		g_engine->set_camera_delta_pan(-30, 0);
 		digi_play("baronstg", 1, 255, -1, 860);
 		kernel_timing_trigger(210, 1000, nullptr);
-
 		break;
 
 	case 92:
 		digi_stop(2);
 		disable_player_commands_and_fade_init(93);
-
 		break;
 
 	case 93:
@@ -160,7 +146,6 @@ void Room860::daemon() {
 		digi_play_loop("950_s45", 3, 80, -1, 950);
 
 		_G(game).new_room = 811;
-
 		break;
 
 	case 1000:
diff --git a/engines/m4/riddle/rooms/section8/room860.h b/engines/m4/riddle/rooms/section8/room860.h
index 2cc4e3d6e33..8f598da2bd3 100644
--- a/engines/m4/riddle/rooms/section8/room860.h
+++ b/engines/m4/riddle/rooms/section8/room860.h
@@ -35,8 +35,6 @@ public:
 
 	void preload() override;
 	void init() override;
-	void pre_parser() override;
-	void parser() override;
 	void daemon() override;
 
 private:
diff --git a/engines/m4/riddle/rooms/section8/room861.cpp b/engines/m4/riddle/rooms/section8/room861.cpp
index 17eaf8d2dbc..e611a41688c 100644
--- a/engines/m4/riddle/rooms/section8/room861.cpp
+++ b/engines/m4/riddle/rooms/section8/room861.cpp
@@ -27,6 +27,11 @@ namespace M4 {
 namespace Riddle {
 namespace Rooms {
 
+void Room861::preload() {
+	Room::preload();
+	_G(player).walker_in_this_scene = false;
+}
+
 void Room861::init() {
 	interface_hide();
 	player_set_commands_allowed(false);
diff --git a/engines/m4/riddle/rooms/section8/room861.h b/engines/m4/riddle/rooms/section8/room861.h
index 0df278d9ecc..d2dbe872fcc 100644
--- a/engines/m4/riddle/rooms/section8/room861.h
+++ b/engines/m4/riddle/rooms/section8/room861.h
@@ -42,6 +42,7 @@ public:
 	Room861() : Room() {}
 	~Room861() override {}
 
+	void preload() override;
 	void init() override;
 	void daemon() override;
 };