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

[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:
bdbd4846e7 M4: RIDDLE: Fix intro room 902


Commit: bdbd4846e7b7ddc205aea7eca05c1c062b3fabe3
    https://github.com/scummvm/scummvm/commit/bdbd4846e7b7ddc205aea7eca05c1c062b3fabe3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-13T10:28:05-07:00

Commit Message:
M4: RIDDLE: Fix intro room 902

Changed paths:
    engines/m4/riddle/rooms/section.cpp
    engines/m4/riddle/rooms/section9/room902.cpp


diff --git a/engines/m4/riddle/rooms/section.cpp b/engines/m4/riddle/rooms/section.cpp
index 4f7adf35077..878480192e9 100644
--- a/engines/m4/riddle/rooms/section.cpp
+++ b/engines/m4/riddle/rooms/section.cpp
@@ -30,7 +30,13 @@ namespace Rooms {
 
 void Section::global_room_init() {
 	digi_preload("950_s51", 950);
-	_GINT().show();
+
+	int roomId = _G(game).room_id;
+
+	if (roomId < 900 && roomId != 494)
+		_GINT().show();
+	else
+		_GINT().hide();
 }
 
 void Section::tick() {
diff --git a/engines/m4/riddle/rooms/section9/room902.cpp b/engines/m4/riddle/rooms/section9/room902.cpp
index c5dff231dfe..923cc93f691 100644
--- a/engines/m4/riddle/rooms/section9/room902.cpp
+++ b/engines/m4/riddle/rooms/section9/room902.cpp
@@ -30,8 +30,8 @@ namespace Riddle {
 namespace Rooms {
 
 void Room902::preload() {
-	_G(player).walker_type = 1;
-	_G(player).shadow_type = 1;
+	_G(player).walker_type = WALKER_ALT;
+	_G(player).shadow_type = SHADOW_ALT;
 	_G(player).walker_in_this_scene = false;
 }
 
@@ -51,63 +51,63 @@ void Room902::init() {
 
 void Room902::daemon() {
 	switch (_G(kernel).trigger) {
-	case -1:
-		// TODO: Is this index correct? Is any of the trigger cases correct?
-		digi_stop(2);
-		break;
-
-	case 0:
-		adv_kill_digi_between_rooms(false);
-		_G(game).setRoom(903);
-		break;
-
 	case 1:
-		series_plain_play("902 one frame hold", -1, 0, 100, 256, 3000);
-		disable_player_commands_and_fade_init(132);
+		kernel_timing_trigger(120, 2);
+		kernel_timing_trigger(100, 789);
 		break;
 
 	case 2:
-		digi_play("gunshot2", 3, 255, -1, 902);
+		series_ranged_play("902 TITLE", 1, 0, 0, 9, 100, 0xa00, 5, 3, 0);
 		break;
 
 	case 3:
-		digi_play("gunshot1", 3);
-		series_stream_break_on_frame(_everything, 144, 102);
+		_title = series_ranged_play("902 TITLE", -1, 0, 9, 9, 100, 0xa00, 500, -1, 0);
+		kernel_timing_trigger(180, 4);
 		break;
 
 	case 4:
-		_G(game).setRoom(494);
+		terminateMachineAndNull(_title);
+		series_ranged_play("902 TITLE", 1, 2, 0, 9, 100, 0xa00, 5, 5, 0);
 		break;
 
 	case 5:
-		_G(game).setRoom(304);
+		kernel_timing_trigger(120, 6);
 		break;
 
-	case 54:
+	case 6:
 		_everything = series_stream("EVERYTHING MINUS TITLE FADE", 6, 0x100, 131);
 		series_stream_break_on_frame(_everything, 121, 101);
 		break;
 
 	case 55:
-		kernel_timing_trigger(120, 6);
+		_G(game).setRoom(304);
 		break;
 
-	case 100:
-		terminateMachineAndNull(_title);
-		series_ranged_play("902 TITLE", 1, 2, 0, 9, 100, 0xa00, 5, 5, 0);
+	case 56:
+		_G(game).setRoom(494);
 		break;
 
 	case 101:
-		_title = series_ranged_play("902 TITLE", -1, 0, 9, 9, 100, 0xa00, 500, -1, 0);
+		digi_play("gunshot1", 3);
+		series_stream_break_on_frame(_everything, 144, 102);
 		break;
 
-	case 130:
-		series_ranged_play("902 TITLE", 1, 0, 0, 9, 100, 0xa00, 5, 3, 0);
+	case 102:
+		digi_play("gunshot2", 3, 255, -1, 902);
 		break;
 
 	case 131:
-		kernel_timing_trigger(120, 2);
-		kernel_timing_trigger(100, 789);
+		series_plain_play("902 one frame hold", -1, 0, 100, 256, 3000);
+		disable_player_commands_and_fade_init(132);
+		break;
+
+	case 132:
+		adv_kill_digi_between_rooms(false);
+		_G(game).setRoom(903);
+		break;
+
+	case 789:
+		digi_stop(2);
 		break;
 
 	default: