[Scummvm-git-logs] scummvm master -> 171799204565f875ba79b9306efc35b289170535

[dreammaster]

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:
1717992045 M4: RIDDLE: Fix entering code and escaping castle underground


Commit: 171799204565f875ba79b9306efc35b289170535
    https://github.com/scummvm/scummvm/commit/171799204565f875ba79b9306efc35b289170535
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-02T10:45:49-08:00

Commit Message:
M4: RIDDLE: Fix entering code and escaping castle underground

Changed paths:
    engines/m4/riddle/flags.h
    engines/m4/riddle/rooms/section4/room406.cpp
    engines/m4/riddle/rooms/section4/room407.cpp
    engines/m4/riddle/rooms/section4/room408.cpp
    engines/m4/riddle/rooms/section7/room710.cpp


diff --git a/engines/m4/riddle/flags.h b/engines/m4/riddle/flags.h
index 1a4c551d93d..74cec724781 100644
--- a/engines/m4/riddle/flags.h
+++ b/engines/m4/riddle/flags.h
@@ -62,7 +62,7 @@ enum Flag {
 	V027 =  27,
 	V028 =  28,
 	V029 =  29,
-	V030 =  30,
+	kLeftCastleUnderground =  30,
 	V031 =  31,
 	V032 =  32,
 	V033 =  33,
diff --git a/engines/m4/riddle/rooms/section4/room406.cpp b/engines/m4/riddle/rooms/section4/room406.cpp
index 50de747c7a9..0688ec77ff8 100644
--- a/engines/m4/riddle/rooms/section4/room406.cpp
+++ b/engines/m4/riddle/rooms/section4/room406.cpp
@@ -383,21 +383,21 @@ void Room406::parser() {
 	} else if (player_said("BILLIARD BALL", "BILLIARD TABLE") && billiardBallOnTable()) {
 		// No implementation
 	} else if (lookFlag && player_said_any("BILLIARD TABLE", "BILLIARD TABLE ")) {
-		if (!_G(flags)[V030])
+		if (!_G(flags)[kLeftCastleUnderground])
 			digi_play("406r41", 1);
 		else if (!_G(flags)[kBilliardBallInCabinet])
 			digi_play("406r02", 1);
 		else
 			digi_play("406r28", 1);
 	} else if (lookFlag && player_said("CUE CABINET")) {
-		if (_G(flags)[V030])
+		if (_G(flags)[kLeftCastleUnderground])
 			digi_play("406r42", 1);
 		else if (_G(flags)[kBilliardBallInCabinet])
 			digi_play("406r29", 1);
 		else
 			digi_play("406r05", 1);
 	} else if (lookFlag && player_said("BALL RACK")) {
-		if (_G(flags)[V030])
+		if (_G(flags)[kLeftCastleUnderground])
 			digi_play("406r42", 1);
 		else if (_G(flags)[kBilliardBallInCabinet])
 			digi_play("406r29", 1);
@@ -491,7 +491,7 @@ void Room406::parser() {
 		}
 	} else if (lookFlag && player_said("ACE OF SPADES")) {
 		_G(flags)[V311] = 1;
-		digi_play(_G(flags)[V030] ? "406r44" : "406r08", 1);
+		digi_play(_G(flags)[kLeftCastleUnderground] ? "406r44" : "406r08", 1);
 	} else if (lookFlag && player_said_any("SWITCH", "ACE OF SPADES ")) {
 		digi_play(player_been_here(456) ? "406r44" : "456r03", 1);
 	} else if (LOOK("BILLIARD BALL")) {
@@ -526,7 +526,7 @@ void Room406::parser() {
 	} else if (lookFlag && player_said("STAMP")) {
 		digi_play("406r19", 1);
 	} else if (lookFlag && player_said(" ")) {
-		digi_play(_G(flags)[V030] ? "406r40" : "406r01", 1);
+		digi_play(_G(flags)[kLeftCastleUnderground] ? "406r40" : "406r01", 1);
 	} else if (useFlag && player_said("DART BOARD")) {
 		digi_play("406r20", 1);
 	} else if (useFlag && player_said_any("BILLIARD TABLE",
diff --git a/engines/m4/riddle/rooms/section4/room407.cpp b/engines/m4/riddle/rooms/section4/room407.cpp
index e483f07bff0..22237d05fba 100644
--- a/engines/m4/riddle/rooms/section4/room407.cpp
+++ b/engines/m4/riddle/rooms/section4/room407.cpp
@@ -1463,7 +1463,7 @@ void Room407::daemon() {
 		break;
 
 	case 392:
-		digi_play("407_s7b", 3, 255, 393);
+		digi_play("407_s27b", 3, 255, 393);
 		break;
 
 	case 393:
@@ -1471,7 +1471,7 @@ void Room407::daemon() {
 		break;
 
 	case 395:
-		_G(flags)[V030] = 1;
+		_G(flags)[kLeftCastleUnderground] = 1;
 		midi_stop();
 		digi_stop(3);
 		_G(game).setRoom(408);
@@ -4250,7 +4250,7 @@ void Room407::useButton3() {
 		break;
 
 	case 1:
-		if (++_buttonFrame3 == 1)
+		if (++_buttonFrame3 == 10)
 			_buttonFrame3 = 0;
 
 		sendWSMessage_10000(1, _lockButton3,
@@ -4353,9 +4353,9 @@ void Room407::useButtons() {
 			_407pu08a, frame1, frame1, 0);
 		sendWSMessage_10000(1, _lockButton2, _407pu08b, frame2, frame2, -1,
 			_407pu08b, frame2, frame2, 0);
-		sendWSMessage_10000(1, _lockButton1, _407pu08c, frame3, frame3, -1,
+		sendWSMessage_10000(1, _lockButton3, _407pu08c, frame3, frame3, -1,
 			_407pu08c, frame3, frame3, 0);
-		sendWSMessage_10000(1, _lockButton1, _407pu08d, frame4, frame4, -1,
+		sendWSMessage_10000(1, _lockButton4, _407pu08d, frame4, frame4, -1,
 			_407pu08d, frame4, frame4, 0);
 
 		hotspot_set_active("BUTTON", true);
diff --git a/engines/m4/riddle/rooms/section4/room408.cpp b/engines/m4/riddle/rooms/section4/room408.cpp
index dd2b30be3cb..043707ff0f1 100644
--- a/engines/m4/riddle/rooms/section4/room408.cpp
+++ b/engines/m4/riddle/rooms/section4/room408.cpp
@@ -200,7 +200,7 @@ void Room408::daemon() {
 	case 42:
 		ws_unhide_walker();
 		DisposePath(_G(my_walker)->walkPath);
-		_G(my_walker)->walkPath = CreateCustomPath(250, 235, -1);
+		_G(my_walker)->walkPath = CreateCustomPath(250, 335, -1);
 		ws_custom_walk(_G(my_walker), 4, -1);
 		sendWSMessage_10000(1, _exit, _ripExits, 31, 1, 44, _ripExits, 1, 1, 0);
 		digi_play("408r31", 1);
diff --git a/engines/m4/riddle/rooms/section7/room710.cpp b/engines/m4/riddle/rooms/section7/room710.cpp
index fdb59b0b70f..88b70f587ac 100644
--- a/engines/m4/riddle/rooms/section7/room710.cpp
+++ b/engines/m4/riddle/rooms/section7/room710.cpp
@@ -150,7 +150,7 @@ void Room710::parser() {
 
 		if (_ladderActiveFl) {
 			digi_play("710R21", 1, 255, -1, -1);
-		} else if (_G(flags[V030] == 0)) {
+		} else if (_G(flags[kLeftCastleUnderground] == 0)) {
 			digi_play("710R02", 1, 255, -1, -1);
 		} else {
 			switch (_G(kernel).trigger) {