[Scummvm-git-logs] scummvm master -> 9d5b1ed634cfdaabce3a5d89e3f22a5185011282

[dreammaster]

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

Summary:
9721d0965c M4: RIDDLE: Fixes for arriving at Ace of Spades Castle
05af129c37 M4: RIDDLE: Rooms should be marked as visited immediately after inited
9d5b1ed634 M4: BURGER: Fix default volume for Wilbur speech


Commit: 9721d0965c924fd11a381d6bf4302a45e30ba241
    https://github.com/scummvm/scummvm/commit/9721d0965c924fd11a381d6bf4302a45e30ba241
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-13T21:55:46-08:00

Commit Message:
M4: RIDDLE: Fixes for arriving at Ace of Spades Castle

Changed paths:
    engines/m4/riddle/rooms/section4/room402.cpp
    engines/m4/riddle/rooms/section4/room404.cpp


diff --git a/engines/m4/riddle/rooms/section4/room402.cpp b/engines/m4/riddle/rooms/section4/room402.cpp
index ccb783b65b4..29d6896ac47 100644
--- a/engines/m4/riddle/rooms/section4/room402.cpp
+++ b/engines/m4/riddle/rooms/section4/room402.cpp
@@ -114,17 +114,12 @@ void Room402::init() {
 			_val13 = 2300;
 			ws_demand_facing(11);
 
-			if (_G(kittyScreaming)) {
+			if (!_G(kittyScreaming)) {
+				ws_demand_location(660, 290);
+				digi_play("402_S03", 1, 255, 19);
+			} else {
 				ws_demand_location(425, 285);
 				player_set_commands_allowed(true);
-			} else {
-				digi_preload("950_s22");
-				_ripDownStairs = series_load("RIP DOWN STAIRS");
-				ws_hide_walker();
-				_ripEnterLeave = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x600, 0,
-					triggerMachineByHashCallback, "rip leaving castle");
-				sendWSMessage_10000(1, _ripEnterLeave, _ripDownStairs, 1, 27, 55,
-					_ripDownStairs, 27, 27, 0);
 			}
 
 		} else if (_G(flags)[V131] != 402) {
diff --git a/engines/m4/riddle/rooms/section4/room404.cpp b/engines/m4/riddle/rooms/section4/room404.cpp
index 71b82106747..ee1b625f0b9 100644
--- a/engines/m4/riddle/rooms/section4/room404.cpp
+++ b/engines/m4/riddle/rooms/section4/room404.cpp
@@ -37,7 +37,7 @@ static const char *NORMAL_NAMES[] = {
 static const int16 SHADOW_DIRS[] = { 200, 201, -1 };
 static const char *SHADOW_NAMES[] = {
 	"butler walker shadow pos1",
-	"wolf walker shadow pos3"
+	"butler walker shadow pos3"
 };
 
 static const char *const SAID[][2] = {


Commit: 05af129c37f54eb30126968bbcad9cec5632ed6b
    https://github.com/scummvm/scummvm/commit/05af129c37f54eb30126968bbcad9cec5632ed6b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-13T21:55:46-08:00

Commit Message:
M4: RIDDLE: Rooms should be marked as visited immediately after inited

Changed paths:
    engines/m4/core/rooms.cpp


diff --git a/engines/m4/core/rooms.cpp b/engines/m4/core/rooms.cpp
index 874528c1bb9..a18395950b0 100644
--- a/engines/m4/core/rooms.cpp
+++ b/engines/m4/core/rooms.cpp
@@ -174,10 +174,10 @@ void Sections::m4SceneLoad() {
 }
 
 void Sections::m4RunScene() {
-	game_control_cycle();
-
 	if (!player_been_here(_G(game).room_id))
 		player_enters_scene(_G(game).room_id);
+
+	game_control_cycle();
 }
 
 void Sections::m4EndScene() {


Commit: 9d5b1ed634cfdaabce3a5d89e3f22a5185011282
    https://github.com/scummvm/scummvm/commit/9d5b1ed634cfdaabce3a5d89e3f22a5185011282
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-13T21:55:46-08:00

Commit Message:
M4: BURGER: Fix default volume for Wilbur speech

Changed paths:
    engines/m4/burger/walker.h


diff --git a/engines/m4/burger/walker.h b/engines/m4/burger/walker.h
index 15bc25e4cc5..388b264363d 100644
--- a/engines/m4/burger/walker.h
+++ b/engines/m4/burger/walker.h
@@ -77,7 +77,7 @@ public:
 	static void unloadSprites();
 
 	void wilbur_speech(const char *name, int trigger = -1, int room = -1, byte flags = 0,
-		int vol = 256, int channel = 1);
+		int vol = 255, int channel = 1);
 	void wilbur_say();
 	void wilburs_speech_finished();
 
@@ -129,7 +129,7 @@ void wilbur_abduct(int trigger);
 void player_walk_to(int32 x, int32 y, int32 facing_x, int32 facing_y, int trigger = -1);
 void player_walk_to(int32 x, int32 y, int trigger = -1);
 void wilbur_speech(const char *name, int trigger = -1, int room = -1, byte flags = 0,
-	int vol = 256, int channel = 1);
+	int vol = 255, int channel = 1);
 
 } // namespace Burger
 } // namespace M4