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

[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:
c812b42971 M4: RIDDLE: modify switch on trigger in room905 as suggested by Dreammaster in his code review


Commit: c812b42971760b9ecf7e5076238d2d40323632f0
    https://github.com/scummvm/scummvm/commit/c812b42971760b9ecf7e5076238d2d40323632f0
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-10-05T00:35:39+02:00

Commit Message:
M4: RIDDLE: modify switch on trigger in room905 as suggested by Dreammaster in his code review

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


diff --git a/engines/m4/riddle/rooms/section9/room905.cpp b/engines/m4/riddle/rooms/section9/room905.cpp
index bc8a8f02df7..ed29746c48d 100644
--- a/engines/m4/riddle/rooms/section9/room905.cpp
+++ b/engines/m4/riddle/rooms/section9/room905.cpp
@@ -55,22 +55,22 @@ void Room905::init() {
 }
 
 void Room905::daemon() {
-	switch (_G(kernel).trigger - 3) {
-	case 0:
+	switch (_G(kernel).trigger) {
+	case 3:
 		series_plain_play("905 hold frame", -1, 0, 100, 256, 3000);
 		break;
 
-	case 1:
+	case 4:
 		_G(game).new_room = 494;
 		_G(game).new_section = 4;
 		break;
 
-	case 17:
+	case 20:
 		_G(game).new_room = 304;
 		_G(game).new_section = 3;
 		break;
 
-	case 27:
+	case 30:
 		_roomStates_field4 -= 3;
 		if (_roomStates_field4 <= 40) {
 			adv_kill_digi_between_rooms(false);
@@ -81,18 +81,18 @@ void Room905::daemon() {
 		}
 		break;
 
-	case 52:
+	case 55:
 		disable_player_commands_and_fade_init(30);
 		break;
 
-	case 53:
+	case 56:
 		if (g_engine->game_camera_panning())
 			kernel_timing_trigger(120, 4, nullptr);
 		else
 			kernel_timing_trigger(150, 20, nullptr);
 		break;
 
-	case 663:
+	case 666:
 		g_engine->camera_shift_xy(0, 0);
 		kernel_timing_trigger(120, 4, nullptr);
 		digi_play("INTMOAN", 1, 255, -1, 901);