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

[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:
e20bf4a412 M4: RIDDLE: Observatory fixes


Commit: e20bf4a4127ddf83a52d8dec67aee089aec4487e
    https://github.com/scummvm/scummvm/commit/e20bf4a4127ddf83a52d8dec67aee089aec4487e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-04T18:42:11-08:00

Commit Message:
M4: RIDDLE: Observatory fixes

Changed paths:
    engines/m4/riddle/rooms/section5/room508.cpp
    engines/m4/riddle/rooms/section5/room508.h


diff --git a/engines/m4/riddle/rooms/section5/room508.cpp b/engines/m4/riddle/rooms/section5/room508.cpp
index 5385c4bbfae..6013dc434ee 100644
--- a/engines/m4/riddle/rooms/section5/room508.cpp
+++ b/engines/m4/riddle/rooms/section5/room508.cpp
@@ -58,7 +58,7 @@ void Room508::init() {
 
 	if (_G(flags)[V157] == 1) {
 		hotspot_set_active("CHAIN ", false);
-		_chainAfterBreak = series_place_sprite("508 CHAIN AFTER BREAK", 0, 0, 0, 100, 0xf00);
+		_chainSprite = series_place_sprite("508 CHAIN AFTER BREAK", 0, 0, 0, 100, 0xf00);
 		_domeAfterTurn = series_place_sprite("DOME SPRITE AFTER ITS TURNED", 0, 0, 0, 100, 0xf00);
 
 		if (inv_object_is_here("CRYSTAL SKULL")) {
@@ -72,8 +72,10 @@ void Room508::init() {
 		}
 	}
 
-	if (!_G(flags)[V157]) {
-		if (_G(flags)[V158]) {
+	if (_G(flags)[V157] == 0 && _G(flags)[V158] == 0) {
+		_chainSprite = series_place_sprite("508 CHAIN BEFORE DOME TURNS", 0, 0, 0, 100, 0xf00);
+
+		if (inv_object_is_here("CRYSTAL SKULL")) {
 			hotspot_set_active("CRYSTAL SKULL ", true);
 			_skull = series_place_sprite("SKULL SPRITE BEFORE DOME TURN", 0, 0, 0, 100, 0x450);
 		}
@@ -200,9 +202,9 @@ void Room508::daemon() {
 		if (_val1) {
 			digi_play("508R16", 1);
 			_val1 = 0;
-		} else {
-			player_set_commands_allowed(true);
 		}
+
+		player_set_commands_allowed(true);
 		break;
 
 	case 515:
@@ -402,7 +404,7 @@ void Room508::daemon() {
 		hotspot_set_active("CHAIN ", false);
 		terminateMachineAndNull(_chain);
 		series_unload(_chainBreaking);
-		_chainAfterBreak = series_place_sprite("508 CHAIN AFTER BREAK", 0, 0, 0, 100, 0xf00);
+		_chainSprite = series_place_sprite("508 CHAIN AFTER BREAK", 0, 0, 0, 100, 0xf00);
 		break;
 
 	case 679:
@@ -516,7 +518,7 @@ void Room508::parser() {
 				player_set_commands_allowed(false);
 				kernel_load_variant("508lock1");
 				_G(kernel).trigger_mode = KT_DAEMON;
-				ws_walk(423, 356, nullptr, 2, 1);
+				kernel_timing_trigger(1, 503);
 			}
 			break;
 
diff --git a/engines/m4/riddle/rooms/section5/room508.h b/engines/m4/riddle/rooms/section5/room508.h
index b3a357a2f64..73ca02bfe89 100644
--- a/engines/m4/riddle/rooms/section5/room508.h
+++ b/engines/m4/riddle/rooms/section5/room508.h
@@ -41,7 +41,7 @@ private:
 	int _flick = 0;
 	machine *_ripley = nullptr;
 	machine *_ripStartTurnDome = nullptr;
-	machine *_chainAfterBreak = nullptr;
+	machine *_chainSprite = nullptr;
 	machine *_domeAfterTurn = nullptr;
 	machine *_skull = nullptr;
 	machine *_shovel = nullptr;