[Scummvm-git-logs] scummvm master -> 549a40bb6eb00b0a52b44570eb45cacaf1b7053b

[Strangerke]

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:
c7284db0e9 M4: RIDDLE: Enlarge palette variable in room 506
549a40bb6e M4: RIDDLE: Fix init in room 996


Commit: c7284db0e97077552aab5773b08a63c1d46f9210
    https://github.com/scummvm/scummvm/commit/c7284db0e97077552aab5773b08a63c1d46f9210
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-18T19:54:20+01:00

Commit Message:
M4: RIDDLE: Enlarge palette variable in room 506

Changed paths:
    engines/m4/riddle/rooms/section5/room506.h


diff --git a/engines/m4/riddle/rooms/section5/room506.h b/engines/m4/riddle/rooms/section5/room506.h
index 4a7d479c9d2..8de8887fc5b 100644
--- a/engines/m4/riddle/rooms/section5/room506.h
+++ b/engines/m4/riddle/rooms/section5/room506.h
@@ -30,7 +30,7 @@ namespace Rooms {
 
 class Room506 : public Room {
 private:
-	RGB8 _palette[39] = {};
+	RGB8 _palette[59] = {};
 	bool _flag1 = false;
 	bool _flag2 = false;
 	bool _flag3 = false;


Commit: 549a40bb6eb00b0a52b44570eb45cacaf1b7053b
    https://github.com/scummvm/scummvm/commit/549a40bb6eb00b0a52b44570eb45cacaf1b7053b
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-18T19:59:01+01:00

Commit Message:
M4: RIDDLE: Fix init in room 996

Changed paths:
    engines/m4/riddle/rooms/section9/room996.cpp
    engines/m4/riddle/rooms/section9/room996.h


diff --git a/engines/m4/riddle/rooms/section9/room996.cpp b/engines/m4/riddle/rooms/section9/room996.cpp
index 18d69b61b27..79d70b10b4d 100644
--- a/engines/m4/riddle/rooms/section9/room996.cpp
+++ b/engines/m4/riddle/rooms/section9/room996.cpp
@@ -40,7 +40,7 @@ void Room996::init() {
 	digi_preload("950_s56", -1);
 	interface_hide();
 	series_show("996mark", 0, 16, -1, -1, 0, 100, 0, 0);
-	_flag = 1;
+	_flagArray[12] = 1;
 	if (_G(flags)[V290]) {
 		_roomStates_loop0 = series_show("996 Charcoal Page", 256, 16, -1, -1, 0, 100, 0, 0);
 		digi_preload("205r13a", -1);
@@ -82,32 +82,51 @@ void Room996::init() {
 	for (int i = 1; i < 12; ++i)
 		_flagArray[i] = 0;
 
-	if (_G(flags)[kEasterIslandCartoon])
+	int index = 1;
+	
+	if (_G(flags)[kEasterIslandCartoon]) {
 		_flagArray[1] = 1;
+		++index;
+	}
 
-	if (_G(flags)[kChinshiCartoon])
-		_flagArray[1] = 2;
+	if (_G(flags)[kChinshiCartoon]) {
+		_flagArray[index] = 2;
+		++index;
+	}
 
-	if (_G(flags)[kTabletsCartoon])
-		_flagArray[1] = 3;
+	if (_G(flags)[kTabletsCartoon]) {
+		_flagArray[index] = 3;
+		++index;
+	}
 
-	if (_G(flags)[kEpitaphCartoon])
-		_flagArray[1] = 5;
+	if (_G(flags)[kEpitaphCartoon]) {
+		_flagArray[index] = 5;
+		++index;
+	}
 
-	if (_G(flags)[kGraveyardCartoon])
-		_flagArray[1] = 4;
+	if (_G(flags)[kGraveyardCartoon]) {
+		_flagArray[index] = 4;
+		++index;
+	}
 
-	if (_G(flags)[kCastleCartoon])
-		_flagArray[1] = 6;
+	if (_G(flags)[kCastleCartoon]) {
+		_flagArray[index] = 6;
+		++index;
+	}
 
-	if (_G(flags)[kMocaMocheCartoon])
-		_flagArray[1] = 7;
+	if (_G(flags)[kMocaMocheCartoon]) {
+		_flagArray[index] = 7;
+		++index;
+	}
 
-	if (_G(flags)[kTempleCartoon])
-		_flagArray[1] = 8;
+	if (_G(flags)[kTempleCartoon]) {
+		_flagArray[index] = 8;
+		++index;
+	}
 
-	if (_G(flags)[kEmeraldCartoon])
-		_flagArray[1] = 9;
+	if (_G(flags)[kEmeraldCartoon]) {
+		_flagArray[index] = 9;
+	}
 
 	_flagArray[12] = 1;
 	_moveValue = 0;
diff --git a/engines/m4/riddle/rooms/section9/room996.h b/engines/m4/riddle/rooms/section9/room996.h
index 580fbe03d78..5019ea5030f 100644
--- a/engines/m4/riddle/rooms/section9/room996.h
+++ b/engines/m4/riddle/rooms/section9/room996.h
@@ -41,7 +41,6 @@ public:
 	void daemon() override;
 
 private:
-	int32 _flag = 0;
 	int32 _flagArray[13];
 	int32 _moveValue = 0;
 	bool _check201Fl = false;