[Scummvm-git-logs] scummvm master -> 22fcc511c5afdff9b92b9e2381d42c9964710ec3

[Strangerke]

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

Summary:
bba93ddf9c M4: RIDDLE: remove debug leftover in room 204
22fcc511c5 M4: RIDDLE: Fix original issue in hardcoded logic in room 205


Commit: bba93ddf9cc05ee8687ca72b9bd712d89239b0e9
    https://github.com/scummvm/scummvm/commit/bba93ddf9cc05ee8687ca72b9bd712d89239b0e9
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-04-09T06:33:44+01:00

Commit Message:
M4: RIDDLE: remove debug leftover in room 204

Changed paths:
    engines/m4/riddle/rooms/section2/room204.cpp


diff --git a/engines/m4/riddle/rooms/section2/room204.cpp b/engines/m4/riddle/rooms/section2/room204.cpp
index 8b121adb03b..76b0a6f946f 100644
--- a/engines/m4/riddle/rooms/section2/room204.cpp
+++ b/engines/m4/riddle/rooms/section2/room204.cpp
@@ -993,7 +993,6 @@ done:
 }
 
 void Room204::daemon() {
-	warning("Trigger %d", _G(kernel).trigger);
 	switch (_G(kernel).trigger) {
 	case 5:
 		digi_play("204r47", 1, 255, -1, -1);


Commit: 22fcc511c5afdff9b92b9e2381d42c9964710ec3
    https://github.com/scummvm/scummvm/commit/22fcc511c5afdff9b92b9e2381d42c9964710ec3
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-04-09T06:34:36+01:00

Commit Message:
M4: RIDDLE: Fix original issue in hardcoded logic in room 205

Changed paths:
    engines/m4/riddle/rooms/section2/room205.cpp


diff --git a/engines/m4/riddle/rooms/section2/room205.cpp b/engines/m4/riddle/rooms/section2/room205.cpp
index fec5d26541d..3ab82606246 100644
--- a/engines/m4/riddle/rooms/section2/room205.cpp
+++ b/engines/m4/riddle/rooms/section2/room205.cpp
@@ -2157,6 +2157,11 @@ void Room205::daemon() {
 		hotspot_set_active(_G(currentSceneDef).hotspots, "FALLEN TABLETS", true);
 		hotspot_set_active(_G(currentSceneDef).hotspots, "GLASSES", true);
 		hotspot_set_active(_G(currentSceneDef).hotspots, "MASTER LU'S TABLET", true);
+		// Note - The original was not disabling this hotspot, but it's weird the crushed enemy is still active of course...
+		// Furthermore, it you exit and re-enter the room, the init properly disables the hotspot.
+		// Thus, the hotspot is now disabled in ScummVM too...
+		hotspot_set_active(_G(currentSceneDef).hotspots, "SHEN GUO", false);
+
 		player_set_commands_allowed(true);
 		_fieldDC = 0;
 		break;