[Scummvm-git-logs] scummvm master -> 6dc0f0a3854a30b9a78c5755f97a313458e2d030
Strangerke
noreply at scummvm.org
Mon Mar 10 19:33:21 UTC 2025
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:
6dc0f0a385 M4: RIDDLE: Fix 2 blockers in room 406 (use cue cabinet, look opened game cabinet)
Commit: 6dc0f0a3854a30b9a78c5755f97a313458e2d030
https://github.com/scummvm/scummvm/commit/6dc0f0a3854a30b9a78c5755f97a313458e2d030
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-10T20:33:09+01:00
Commit Message:
M4: RIDDLE: Fix 2 blockers in room 406 (use cue cabinet, look opened game cabinet)
Changed paths:
engines/m4/riddle/flags.h
engines/m4/riddle/rooms/section4/room406.cpp
diff --git a/engines/m4/riddle/flags.h b/engines/m4/riddle/flags.h
index f93174453a6..d7dd7517942 100644
--- a/engines/m4/riddle/flags.h
+++ b/engines/m4/riddle/flags.h
@@ -352,7 +352,7 @@ enum Flag {
V314 = 314,
V315 = 315,
kCrackedMirror = 316,
- V317 = 317,
+ V317 = 317, // Look at the game cabinet for the first time after opening it, room 406
V318 = 318,
V319 = 319,
V320 = 320,
diff --git a/engines/m4/riddle/rooms/section4/room406.cpp b/engines/m4/riddle/rooms/section4/room406.cpp
index a03bfc87e77..ab0942d3e6c 100644
--- a/engines/m4/riddle/rooms/section4/room406.cpp
+++ b/engines/m4/riddle/rooms/section4/room406.cpp
@@ -443,11 +443,13 @@ void Room406::parser() {
} else if (lookFlag && player_said("GAMES CABINET ")) {
switch (_G(kernel).trigger) {
case -1:
- digi_play("406r25", 1);
if (!_G(flags)[V317]) {
player_set_commands_allowed(false);
_G(flags)[V317] = 1;
- }
+ digi_play("406r25", 1, 255, 2, -1);
+ } else
+ digi_play("406r25", 1, 255, -1, -1);
+
break;
case 2:
digi_play("406r25a", 1, 255, 3);
@@ -628,7 +630,10 @@ void Room406::parser() {
case -1:
player_set_commands_allowed(false);
_ripReachHand = series_load("RIP TREK MED REACH HAND POS1");
+ setGlobals1(_ripReachHand, 1, 10, 10, 10, 0, 10, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ sendWSMessage_110000(_G(my_walker), 1);
break;
+
case 1:
digi_play("406_s04", 2, 255, 2);
break;
More information about the Scummvm-git-logs
mailing list