[Scummvm-git-logs] scummvm master -> 0aeea03fab692cfd80415d483c4f7af74792038d
dreammaster
noreply at scummvm.org
Tue Aug 11 10:38:23 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
0aeea03fab M4: RIDDLE: Fix blocker in room 603 when taking the pole
Commit: 0aeea03fab692cfd80415d483c4f7af74792038d
https://github.com/scummvm/scummvm/commit/0aeea03fab692cfd80415d483c4f7af74792038d
Author: sloanext (46776957+sloanext at users.noreply.github.com)
Date: 2026-08-11T20:38:19+10:00
Commit Message:
M4: RIDDLE: Fix blocker in room 603 when taking the pole
While Twelvetrees is still present (any V203 value other than 0 and 4),
case -1 of takePole() disabled the player commands and loaded the reach
series but never dispatched a trigger, so case 2 never ran and the game
was stuck.
Reach for the pole the way the V203 == 4 branch and the parser's
V203 == 0 case already do, so Twelvetrees objects with 603t03 and case 3
can release the reach through sendWSMessage_140000().
Changed paths:
engines/m4/riddle/rooms/section6/room603.cpp
diff --git a/engines/m4/riddle/rooms/section6/room603.cpp b/engines/m4/riddle/rooms/section6/room603.cpp
index d08489ff4a6..83eba3d5bd5 100644
--- a/engines/m4/riddle/rooms/section6/room603.cpp
+++ b/engines/m4/riddle/rooms/section6/room603.cpp
@@ -2122,6 +2122,8 @@ bool Room603::takePole() {
player_set_commands_allowed(false);
_ttShould = _val5 ? 12 : 7;
_ripAction = series_load("RIP MED REACH 1HAND POS2");
+ setGlobals1(_ripAction, 1, 15, 15, 15);
+ sendWSMessage_110000(2);
return true;
}
break;
More information about the Scummvm-git-logs
mailing list