[Scummvm-git-logs] scummvm master -> 0178b5290ff60cfbd24a71e30ee235a84f6e3839

Strangerke noreply at scummvm.org
Sun Jul 6 15:34:52 UTC 2025


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:
0178b5290f M4: RIDDLE: Fix for bug #16075 in room 303: Crash after looking at the copper tank viewer before visiting room 301


Commit: 0178b5290ff60cfbd24a71e30ee235a84f6e3839
    https://github.com/scummvm/scummvm/commit/0178b5290ff60cfbd24a71e30ee235a84f6e3839
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-07-06T16:34:19+01:00

Commit Message:
M4: RIDDLE: Fix for bug #16075 in room 303: Crash after looking at the copper tank viewer before visiting room 301

Changed paths:
    engines/m4/riddle/rooms/section3/room303.cpp


diff --git a/engines/m4/riddle/rooms/section3/room303.cpp b/engines/m4/riddle/rooms/section3/room303.cpp
index 0886ac4240e..f363fb1c604 100644
--- a/engines/m4/riddle/rooms/section3/room303.cpp
+++ b/engines/m4/riddle/rooms/section3/room303.cpp
@@ -235,8 +235,7 @@ void Room303::init() {
 
 			_fengLi = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 480, 256, 86, 0xc00, true,
 				triggerMachineByHashCallback, "fl");
-			sendWSMessage_10000(1, _fengLi, _feng4, 1, 16, 400,
-				_feng4, 1, 6, 0);
+			sendWSMessage_10000(1, _fengLi, _feng4, 1, 1, 400, _feng4, 1, 6, 0);
 
 			_fengMode = _fengShould = 1;
 			setShadow5(true);
@@ -254,6 +253,7 @@ void Room303::init() {
 		} else {
 			_ripBends = series_load("RIP BENDS TO SEE CREATURE");
 			setGlobals1(_ripBends, 26, 1, 1, 1);
+			sendWSMessage_110000(60);
 		}
 		break;
 
@@ -303,7 +303,7 @@ void Room303::init() {
 
 void Room303::daemon() {
 	int frame;
-	
+
 	switch (_G(kernel).trigger) {
 	case 3:
 		sendWSMessage_120000(4);




More information about the Scummvm-git-logs mailing list