[Scummvm-git-logs] scummvm master -> 5ba6e2f56713f5788ad3337ec537016c3363c409

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
50227ce25d M4: RIDDLE: Fix getting crystal skull
5ba6e2f567 M4: RIDDLE: Fix initial display of observatory door


Commit: 50227ce25dd18a5d450c40cb13e1f51b12e304e5
    https://github.com/scummvm/scummvm/commit/50227ce25dd18a5d450c40cb13e1f51b12e304e5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-04T07:59:36-08:00

Commit Message:
M4: RIDDLE: Fix getting crystal skull

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


diff --git a/engines/m4/riddle/rooms/section5/room510.cpp b/engines/m4/riddle/rooms/section5/room510.cpp
index 1d300ff0c8d..f64cc767ce8 100644
--- a/engines/m4/riddle/rooms/section5/room510.cpp
+++ b/engines/m4/riddle/rooms/section5/room510.cpp
@@ -364,6 +364,7 @@ void Room510::parser() {
 		case 6:
 			_G(flags)[V292] = 1;
 			series_unload(_ripStartsDownWall);
+			player_set_commands_allowed(true);
 			break;
 		case 7:
 			terminateMachineAndNull(_pu03);


Commit: 5ba6e2f56713f5788ad3337ec537016c3363c409
    https://github.com/scummvm/scummvm/commit/5ba6e2f56713f5788ad3337ec537016c3363c409
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-04T07:59:36-08:00

Commit Message:
M4: RIDDLE: Fix initial display of observatory door

Changed paths:
    engines/m4/riddle/rooms/section5/room507.cpp
    engines/m4/riddle/rooms/section5/room507.h


diff --git a/engines/m4/riddle/rooms/section5/room507.cpp b/engines/m4/riddle/rooms/section5/room507.cpp
index 758c6dfd8e1..78201c8f099 100644
--- a/engines/m4/riddle/rooms/section5/room507.cpp
+++ b/engines/m4/riddle/rooms/section5/room507.cpp
@@ -41,9 +41,6 @@ int BLOCK_CORRECT[8] = {
 };
 
 Room507::Room507() : Room() {
-	Common::fill(_blockSeries, _blockSeries + 8, 0);
-	Common::fill(_block, _block + 8, (machine *)nullptr);
-	Common::fill(_blockFlag, _blockFlag + 8, false);
 }
 
 void Room507::preload() {
@@ -65,7 +62,7 @@ void Room507::init() {
 	for (int i = 1; i <= 7; ++i) {
 		_blockFlag[i] = false;
 		_blockSeries[i] = series_load(BLOCK_NAMES[1]);
-		_block[1] = series_show(BLOCK_NAMES[1], 0x400, 16, -1, -1,
+		_block[1] = series_show(BLOCK_NAMES[i], 0x400, 16, -1, -1,
 			_G(flags)[(Flag)(V172 + i)]);
 	}
 
diff --git a/engines/m4/riddle/rooms/section5/room507.h b/engines/m4/riddle/rooms/section5/room507.h
index 43040806712..5d49a7fca59 100644
--- a/engines/m4/riddle/rooms/section5/room507.h
+++ b/engines/m4/riddle/rooms/section5/room507.h
@@ -30,9 +30,9 @@ namespace Rooms {
 
 class Room507 : public Room {
 private:
-	int _blockSeries[8];
-	machine *_block[8];
-	bool _blockFlag[8];
+	int _blockSeries[8] = { 0 };
+	machine *_block[8] = { nullptr };
+	bool _blockFlag[8] = { false };
 	int _doorSeries = 0;
 	machine *_door = nullptr;