[Scummvm-git-logs] scummvm master -> 055079fb09cdb7b1809883fae38fa3b46b0910d5

[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:
61e51ad02c M4: BURGER: Accidental cleanup in room 207
055079fb09 M4: RIDDLE: Fix a blocker when giving cash to the beggar in room 207


Commit: 61e51ad02c8684776b166d65f384fade27d4d335
    https://github.com/scummvm/scummvm/commit/61e51ad02c8684776b166d65f384fade27d4d335
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-28T09:53:15+01:00

Commit Message:
M4: BURGER: Accidental cleanup in room 207

Changed paths:
    engines/m4/burger/rooms/section2/room207.cpp


diff --git a/engines/m4/burger/rooms/section2/room207.cpp b/engines/m4/burger/rooms/section2/room207.cpp
index 0bf7daa67f8..a99497cc24e 100644
--- a/engines/m4/burger/rooms/section2/room207.cpp
+++ b/engines/m4/burger/rooms/section2/room207.cpp
@@ -78,33 +78,33 @@ const seriesPlayBreak Room207::PLAY8[] = {
 };
 
 const seriesPlayBreak Room207::PLAY9[] = {
-	{ 23, 5, 0, 0, 0, -1, 0, 0, 0, 0 },
+	{ 23, 5, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
 	PLAY_BREAK_END
 };
 
 const seriesPlayBreak Room207::PLAY10[] = {
-	{ 31, 24, 0, 0, 0, -1, 0, 0, 0, 0 },
+	{ 31, 24, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
 	PLAY_BREAK_END
 };
 
 const seriesPlayBreak Room207::PLAY11[] = {
-	{ 24, 31, 0, 0, 0, -1, 0, 0, 0, 0 },
+	{ 24, 31, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
 	PLAY_BREAK_END
 };
 
 const seriesPlayBreak Room207::PLAY12[] = {
-	{ 18, 22, 0, 0, 0, -1, 0, 0, 0, 0 },
+	{ 18, 22, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
 	PLAY_BREAK_END
 };
 
 const seriesStreamBreak Room207::SERIES1[] = {
-	{ 0, 0, 0, 0, -1, 0, 0, 0 },
-	{ 18, "207w001", 1, 255, -1, 0, 0, 0 },
+	{ 0, nullptr, 0, 0, -1, 0, nullptr, 0 },
+	{ 18, "207w001", 1, 255, -1, 0, nullptr, 0 },
 	STREAM_BREAK_END
 };
 
 const seriesStreamBreak Room207::SERIES2[] = {
-	{ 0, 0, 0, 0, -1, 0, 0, 0 },
+	{ 0, nullptr, 0, 0, -1, 0, nullptr, 0 },
 	STREAM_BREAK_END
 };
 
@@ -398,9 +398,9 @@ void Room207::parser() {
 
 void Room207::handleConv() {
 	const char *sound = conv_sound_to_play();
-	int who = conv_whos_talking();
-	int node = conv_current_node();
-	int entry = conv_current_entry();
+	const int who = conv_whos_talking();
+	const int node = conv_current_node();
+	const int entry = conv_current_entry();
 
 	if (sound) {
 		if (who == 1) {
@@ -420,7 +420,7 @@ void Room207::handleConv() {
 }
 
 int Room207::getAstralShould() const {
-	int rand = imath_ranged_rand(1, 24);
+	const int rand = imath_ranged_rand(1, 24);
 
 	switch (_astralMode) {
 	case 15:
@@ -468,7 +468,7 @@ int Room207::getAstralShould() const {
 }
 
 int Room207::getWilburShould() const {
-	int rand = imath_ranged_rand(1, 8);
+	const int rand = imath_ranged_rand(1, 8);
 	return (rand == 1) ? 4 : 3;
 }
 


Commit: 055079fb09cdb7b1809883fae38fa3b46b0910d5
    https://github.com/scummvm/scummvm/commit/055079fb09cdb7b1809883fae38fa3b46b0910d5
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-28T09:53:44+01:00

Commit Message:
M4: RIDDLE: Fix a blocker when giving cash to the beggar in room 207

Changed paths:
    engines/m4/riddle/rooms/section2/room207.cpp


diff --git a/engines/m4/riddle/rooms/section2/room207.cpp b/engines/m4/riddle/rooms/section2/room207.cpp
index b1bc5f183ce..be0f598c9e5 100644
--- a/engines/m4/riddle/rooms/section2/room207.cpp
+++ b/engines/m4/riddle/rooms/section2/room207.cpp
@@ -355,7 +355,7 @@ void Room207::parser() {
 			break;
 
 		case 4:
-			series_ranged_play_xy("rip trek low reacher pos1", 1, 2, 0, 9, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 512, 6, 6, false);
+			series_ranged_play_xy("rip trek low reacher pos1", 1, 2, 0, 9, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 512, 5, 5, false);
 			_peasantShould = 0;
 
 			break;