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

[Strangerke]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f64634f3d0 M4: RIDDLE: Rework room801::init()
ee89bac5e9 M4: RIDDLE: Use KERNEL_RESTORING_GAME in rooms 802 and 803


Commit: f64634f3d0925ce04d2babc1de6bf28ab7e6095a
    https://github.com/scummvm/scummvm/commit/f64634f3d0925ce04d2babc1de6bf28ab7e6095a
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-10-13T02:06:35+01:00

Commit Message:
M4: RIDDLE: Rework room801::init()

Changed paths:
    engines/m4/riddle/rooms/section8/room801.cpp


diff --git a/engines/m4/riddle/rooms/section8/room801.cpp b/engines/m4/riddle/rooms/section8/room801.cpp
index 6601ab5adfe..f9e5b2f6155 100644
--- a/engines/m4/riddle/rooms/section8/room801.cpp
+++ b/engines/m4/riddle/rooms/section8/room801.cpp
@@ -110,19 +110,7 @@ void Room801::init() {
 		_roomStates_field9Eh = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1,
 														 20, 310, 3, triggerMachineByHashCallback3000, "mc_trek");
 		kernel_timing_trigger(60, 1, nullptr);
-	} else if (_G(game).previous_room < 850 || _G(game).previous_room != -2) {
-		// CHECKME: the second part of the check is useless. That's suspicious.
-		ws_demand_facing(_G(my_walker), 8);
-		ws_demand_location(_G(my_walker), 525, 301);
-		_roomStates_loop3 = series_load("rip returns from root cellar", -1, nullptr);
-		_roomStates_tt = 1;
-		hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", true);
-		hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar  ", false);
-		hotspot_set_active(_G(currentSceneDef).hotspots, "ROOT CELLAR", true);
-		_roomStates_field24 = series_load("CELLAR DOOR OPEN", -1, nullptr);
-		_roomStates_fieldAAh = series_place_sprite("CELLAR DOOR OPEN", 0, 0, -53, 100, 1024);
-		kernel_timing_trigger(10, 7, nullptr);
-	} else {
+	} else if (_G(game).previous_room == KERNEL_RESTORING_GAME) {
 		if (_roomStates_tt) {
 			hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", true);
 			hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar  ", false);
@@ -140,6 +128,17 @@ void Room801::init() {
 		_roomStates_field9Eh = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 1280, 0, triggerMachineByHashCallback, "mc talk frames");
 		_roomStates_fieldA2h = series_show("SAFARI SHADOW 5", 1280, 16, -1, -1, 0, 50, 124, 304);
 		sendWSMessage_10000(1, _roomStates_field9Eh, _roomStates_field782, 42, 42, 0, _roomStates_field782, 42, 42, 0);
+	} else if (_G(game).previous_room < 850) {
+		ws_demand_facing(_G(my_walker), 8);
+		ws_demand_location(_G(my_walker), 525, 301);
+		_roomStates_loop3 = series_load("rip returns from root cellar", -1, nullptr);
+		_roomStates_tt = 1;
+		hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", true);
+		hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar  ", false);
+		hotspot_set_active(_G(currentSceneDef).hotspots, "ROOT CELLAR", true);
+		_roomStates_field24 = series_load("CELLAR DOOR OPEN", -1, nullptr);
+		_roomStates_fieldAAh = series_place_sprite("CELLAR DOOR OPEN", 0, 0, -53, 100, 1024);
+		kernel_timing_trigger(10, 7, nullptr);
 	}
 }
 
@@ -1013,6 +1012,7 @@ void Room801::daemon() {
 		default:
 			break;
 		}
+		break;
 	case 300:
 		switch (_roomStates_pu2) {
 		case 1:


Commit: ee89bac5e9d409c792c2591d60e75397922a8a29
    https://github.com/scummvm/scummvm/commit/ee89bac5e9d409c792c2591d60e75397922a8a29
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-10-13T02:07:04+01:00

Commit Message:
M4: RIDDLE: Use KERNEL_RESTORING_GAME in rooms 802 and 803

Changed paths:
    engines/m4/riddle/rooms/section8/room802.cpp
    engines/m4/riddle/rooms/section8/room803.cpp


diff --git a/engines/m4/riddle/rooms/section8/room802.cpp b/engines/m4/riddle/rooms/section8/room802.cpp
index 7c69e65582c..f8f92b673c8 100644
--- a/engines/m4/riddle/rooms/section8/room802.cpp
+++ b/engines/m4/riddle/rooms/section8/room802.cpp
@@ -128,7 +128,7 @@ void Room802::init() {
 	if (_G(flags)[V255])
 		hotspot_set_active(_G(currentSceneDef).hotspots, "WALL", false);
 
-	if (_G(game).previous_room == -2)
+	if (_G(game).previous_room == KERNEL_RESTORING_GAME)
 		return;
 
 	if (_G(game).previous_room != 801) {
diff --git a/engines/m4/riddle/rooms/section8/room803.cpp b/engines/m4/riddle/rooms/section8/room803.cpp
index b5b4a297d6d..e1cd6e0dc96 100644
--- a/engines/m4/riddle/rooms/section8/room803.cpp
+++ b/engines/m4/riddle/rooms/section8/room803.cpp
@@ -410,7 +410,7 @@ void Room803::daemon() {
 
 void Room803::initWalker() {
 	switch (_G(game).previous_room) {
-	case -2:
+	case KERNEL_RESTORING_GAME:
 		if (_G(flags)[V276] == 0) {
 			_mcWalkerMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, 357, 175, 3, Walker::player_walker_callback, "mc");
 		}