[Scummvm-git-logs] scummvm master -> 87e155f8625583a5d7f376b0f43162c8acbd8826

[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:
87e155f862 M4: RIDDLE: Fix entering top of tower room 510


Commit: 87e155f8625583a5d7f376b0f43162c8acbd8826
    https://github.com/scummvm/scummvm/commit/87e155f8625583a5d7f376b0f43162c8acbd8826
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-03T20:26:22-08:00

Commit Message:
M4: RIDDLE: Fix entering top of tower room 510

Changed paths:
    engines/m4/adv_r/adv_hotspot.cpp
    engines/m4/riddle/rooms/section5/room510.cpp


diff --git a/engines/m4/adv_r/adv_hotspot.cpp b/engines/m4/adv_r/adv_hotspot.cpp
index 57917226714..9f153573220 100644
--- a/engines/m4/adv_r/adv_hotspot.cpp
+++ b/engines/m4/adv_r/adv_hotspot.cpp
@@ -284,7 +284,7 @@ void hotspot_set_active(HotSpotRec *head, const char *name, bool active_or_not)
 	cstrupr(name_str);
 
 	for (i = head; i; i = i->next) {
-		if (!scumm_strnicmp(i->vocab, name_str, MAX_FILENAME_SIZE)) {
+		if (i->vocab && !scumm_strnicmp(i->vocab, name_str, MAX_FILENAME_SIZE)) {
 			i->active = active_or_not;
 			hotspot_found = true;
 		}
diff --git a/engines/m4/riddle/rooms/section5/room510.cpp b/engines/m4/riddle/rooms/section5/room510.cpp
index 7052d97dc70..606f9fa584a 100644
--- a/engines/m4/riddle/rooms/section5/room510.cpp
+++ b/engines/m4/riddle/rooms/section5/room510.cpp
@@ -123,7 +123,7 @@ void Room510::init() {
 		_G(flags)[V292] = 0;
 	}
 
-	if (_G(game).previous_room != KERNEL_RESTORING_GAME) {
+	if (_G(game).previous_room == KERNEL_RESTORING_GAME) {
 		if (_G(flags)[V170]) {
 			ws_hide_walker();
 			_steps = series_play("RIP DANGLES FROM ROPE", 0x100, 16, -1, 5);
@@ -146,6 +146,7 @@ void Room510::daemon() {
 	switch (_G(kernel).trigger) {
 	case 110:
 		terminateMachineAndNull(_steps);
+		ws_unhide_walker();
 		series_unload(_stepsSeries);
 		ws_walk(407, 97, nullptr, 999, 8);
 		break;