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

dreammaster noreply at scummvm.org
Sun Nov 17 05:48:24 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:
a58d198e2f M4: RIDDLE: Fix Ripley animating in room 403 conv


Commit: a58d198e2fd2108a274d9fef0379231e8c9a7a7f
    https://github.com/scummvm/scummvm/commit/a58d198e2fd2108a274d9fef0379231e8c9a7a7f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-16T21:48:17-08:00

Commit Message:
M4: RIDDLE: Fix Ripley animating in room 403 conv

Changed paths:
    engines/m4/riddle/rooms/section4/room403.cpp


diff --git a/engines/m4/riddle/rooms/section4/room403.cpp b/engines/m4/riddle/rooms/section4/room403.cpp
index 9ae8c601423..741c1709409 100644
--- a/engines/m4/riddle/rooms/section4/room403.cpp
+++ b/engines/m4/riddle/rooms/section4/room403.cpp
@@ -311,7 +311,7 @@ void Room403::daemon() {
 				break;
 
 			case 1101:
-				_ripleyShould = 1003;
+				_ripleyShould = 1103;
 				kernel_timing_trigger(1, 102);
 
 				conv_load("conv403a", 10, 10, 101);
@@ -320,7 +320,7 @@ void Room403::daemon() {
 				conv_export_value_curr(_G(flags)[V122], 2);
 				conv_export_value_curr(_G(flags)[V120], 3);
 
-				conv_export_value_curr(inv_player_has("POMERANIAN MARKS") ? 1 : 0, 5);
+				conv_export_value_curr(inv_player_has("POMERANIAN MARKS") ? 1 : 0, 4);
 				conv_export_pointer_curr(&_G(flags)[V114], 5);
 				conv_export_pointer_curr(&_G(flags)[V115], 6);
 				conv_export_value_curr(_G(flags)[V337], 10);




More information about the Scummvm-git-logs mailing list