[Scummvm-git-logs] scummvm master -> 42dabdbc35225f9499c46b0d4c767439edb36fbd

dreammaster noreply at scummvm.org
Tue Feb 4 05:42:52 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:
42dabdbc35 M4: RIDDLE: Fix sketching on top of tower


Commit: 42dabdbc35225f9499c46b0d4c767439edb36fbd
    https://github.com/scummvm/scummvm/commit/42dabdbc35225f9499c46b0d4c767439edb36fbd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-03T21:41:10-08:00

Commit Message:
M4: RIDDLE: Fix sketching on top of tower

Changed paths:
    engines/m4/riddle/riddle.cpp
    engines/m4/riddle/rooms/section5/room510.cpp


diff --git a/engines/m4/riddle/riddle.cpp b/engines/m4/riddle/riddle.cpp
index 5f99eb23f2d..83d8580b133 100644
--- a/engines/m4/riddle/riddle.cpp
+++ b/engines/m4/riddle/riddle.cpp
@@ -729,7 +729,7 @@ void sketchInJournal(const char *digiName) {
 		series_unload(_G(ripSketching));
 		digi_unload("950_s34");
 		player_set_commands_allowed(true);
-		return;
+		break;
 
 	case 7:
 		if (_G(player_info).facing == 3 || _G(player_info).facing == 9)
diff --git a/engines/m4/riddle/rooms/section5/room510.cpp b/engines/m4/riddle/rooms/section5/room510.cpp
index 606f9fa584a..cee43fbac62 100644
--- a/engines/m4/riddle/rooms/section5/room510.cpp
+++ b/engines/m4/riddle/rooms/section5/room510.cpp
@@ -774,6 +774,7 @@ void Room510::parser() {
 			case 6:
 				_G(flags)[V089] = 1;
 				_G(flags)[kMocaMocheCartoon] = 1;
+				sketchInJournal(nullptr);
 				break;
 			case 100:
 				_G(kernel).trigger = -1;




More information about the Scummvm-git-logs mailing list