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

[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:
f71666b563 M4: RIDDLE: Fix daemon check order in room 905


Commit: f71666b5638499694a42e85658c11f70931bb618
    https://github.com/scummvm/scummvm/commit/f71666b5638499694a42e85658c11f70931bb618
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-10-06T08:23:05+02:00

Commit Message:
M4: RIDDLE: Fix daemon check order in room 905

Changed paths:
    engines/m4/riddle/rooms/section9/room905.cpp
    engines/m4/riddle/rooms/section9/room918.cpp


diff --git a/engines/m4/riddle/rooms/section9/room905.cpp b/engines/m4/riddle/rooms/section9/room905.cpp
index ed29746c48d..1b6fc0cb0ab 100644
--- a/engines/m4/riddle/rooms/section9/room905.cpp
+++ b/engines/m4/riddle/rooms/section9/room905.cpp
@@ -57,17 +57,21 @@ void Room905::init() {
 void Room905::daemon() {
 	switch (_G(kernel).trigger) {
 	case 3:
-		series_plain_play("905 hold frame", -1, 0, 100, 256, 3000);
+		g_engine->camera_shift_xy(0, 0);
+		kernel_timing_trigger(120, 4, nullptr);
+		digi_play("INTMOAN", 1, 255, -1, 901);
+		kernel_timing_trigger(60, 100, nullptr);
 		break;
 
 	case 4:
-		_G(game).new_room = 494;
-		_G(game).new_section = 4;
+		if (g_engine->game_camera_panning())
+			kernel_timing_trigger(120, 4, nullptr);
+		else
+			kernel_timing_trigger(150, 20, nullptr);
 		break;
 
 	case 20:
-		_G(game).new_room = 304;
-		_G(game).new_section = 3;
+		disable_player_commands_and_fade_init(30);
 		break;
 
 	case 30:
@@ -82,21 +86,21 @@ void Room905::daemon() {
 		break;
 
 	case 55:
-		disable_player_commands_and_fade_init(30);
+		_G(game).new_room = 304;
+		_G(game).new_section = 3;
 		break;
 
 	case 56:
-		if (g_engine->game_camera_panning())
-			kernel_timing_trigger(120, 4, nullptr);
-		else
-			kernel_timing_trigger(150, 20, nullptr);
+		_G(game).new_room = 494;
+		_G(game).new_section = 4;
 		break;
 
 	case 666:
-		g_engine->camera_shift_xy(0, 0);
-		kernel_timing_trigger(120, 4, nullptr);
-		digi_play("INTMOAN", 1, 255, -1, 901);
-		kernel_timing_trigger(60, 100, nullptr);
+		series_plain_play("905 hold frame", -1, 0, 100, 256, 3000);
+		break;
+
+	case 1000:
+		digi_stop(2);
 		break;
 
 	default:
diff --git a/engines/m4/riddle/rooms/section9/room918.cpp b/engines/m4/riddle/rooms/section9/room918.cpp
index b94307cfef1..ca5566437fc 100644
--- a/engines/m4/riddle/rooms/section9/room918.cpp
+++ b/engines/m4/riddle/rooms/section9/room918.cpp
@@ -203,6 +203,7 @@ void Room918::daemon() {
 	case 320:
 		disable_player_commands_and_fade_init(true);
 		break;
+
 	case 325:
 		digi_play("908f01", 1, 255, 340, 908);
 		break;