[Scummvm-git-logs] scummvm master -> f6bf3dcf0bd1fd92b0e2d0ed455b4c512f79e701

dreammaster noreply at scummvm.org
Thu Oct 24 02:05:16 UTC 2024


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:
f6bf3dcf0b M4: RIDDLE: Script fixes identified by Sev


Commit: f6bf3dcf0bd1fd92b0e2d0ed455b4c512f79e701
    https://github.com/scummvm/scummvm/commit/f6bf3dcf0bd1fd92b0e2d0ed455b4c512f79e701
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-23T19:05:01-07:00

Commit Message:
M4: RIDDLE: Script fixes identified by Sev

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 2e66f9298bc..448ed07e8fa 100644
--- a/engines/m4/riddle/rooms/section6/room603.cpp
+++ b/engines/m4/riddle/rooms/section6/room603.cpp
@@ -666,12 +666,12 @@ void Room603::daemon() {
 			break;
 
 		case 10:
-			if (_num1 == 9) {
+			if (_num1 == 10) {
 				sendWSMessage_10000(1, _ripley, _ripHandsHips, 12, 12, 300,
-					_ripHandChin, 12, 12, 0);
+					_ripHandsHips, 12, 12, 0);
 			} else {
 				sendWSMessage_10000(1, _ripley, _ripHandsHips, 12, 1, 300,
-					_ripHandsHips, 1, 1, 0);
+					_rp04, 1, 1, 0);
 				_num2 = 0;
 			}
 			break;
@@ -1578,7 +1578,7 @@ void Room603::conv603a() {
 					_pu01 = series_stream("603pu03", 5, 0, 30);
 					_val8 = 6;
 
-					if (_val5)
+					if (_trigger1)
 						kernel_timing_trigger(1, _trigger1, KT_DAEMON, KT_PARSE);
 				} else {
 					_pu01 = series_stream("603pu03a", 5, 0, 30);




More information about the Scummvm-git-logs mailing list